ctf: Move CTF plugins to Java 7 and fix warnings

[deliverable/tracecompass.git] / org.eclipse.linuxtools.ctf.core / src / org / eclipse / linuxtools / ctf / core / event / CTFCallsite.java

diff --git a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/CTFCallsite.java b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/CTFCallsite.java
index 26dd7ff7eeb60fdebe043f774f87263aa7338e83..9c33db3fa4b9e07d37542cb357ccf869da0c965f 100644 (file)
--- a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/CTFCallsite.java
+++ b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/CTFCallsite.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2012 Ericsson
+ * Copyright (c) 2012, 2013 Ericsson
  *
  * All rights reserved. This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License v1.0 which
@@ -21,63 +21,68 @@ package org.eclipse.linuxtools.ctf.core.event;
  * @since 1.2
  */
 public class CTFCallsite implements Comparable<CTFCallsite> {
-    /**
-     * The callsite constructor
-     *
-     * @param en
-     *            The event name
-     * @param func
-     *            the function name
-     * @param ip
-     *            the instruction pointer of the callsite
-     * @param fn
-     *            the file name of the callsite
-     * @param line
-     *            the line number of the callsite
-     */
-    public CTFCallsite(String en, String func, long ip, String fn, long line) {
-        EventName = en;
-        FileName = fn;
-        FunctionName = func;
-        this.ip = ip;
-        this.LineNumber = line;
-    }
 
-    static private final long MASK32 = 0x00000000ffffffffL;
+    private static final long MASK32 = 0x00000000ffffffffL;
+
     /**
      * The event name
      */
-    private final String EventName;
+    private final String eventName;
+
     /**
      * the file name of the callsite
      */
-    private final String FileName;
+    private final String fileName;
+
     /**
      * the instruction pointer
      */
     private final long ip;
+
     /**
      * the function name
      */
-    private final String FunctionName;
+    private final String functionName;
+
     /**
      * the line number of the callsite
      */
-    private final long LineNumber;
+    private final long lineNumber;
+
+    /**
+     * The callsite constructor
+     *
+     * @param en
+     *            The event name
+     * @param func
+     *            the function name
+     * @param ip
+     *            the instruction pointer of the callsite
+     * @param fn
+     *            the file name of the callsite
+     * @param line
+     *            the line number of the callsite
+     */
+    public CTFCallsite(String en, String func, long ip, String fn, long line) {
+        eventName = en;
+        fileName = fn;
+        functionName = func;
+        this.ip = ip;
+        this.lineNumber = line;
+    }
 
-    /* Getters */
     /**
      * @return the eventName
      */
     public String getEventName() {
-        return EventName;
+        return eventName;
     }
 
     /**
      * @return the fileName
      */
     public String getFileName() {
-        return FileName;
+        return fileName;
     }
 
     /**
@@ -91,14 +96,14 @@ public class CTFCallsite implements Comparable<CTFCallsite> {
      * @return the functionName
      */
     public String getFunctionName() {
-        return FunctionName;
+        return functionName;
     }
 
     /**
      * @return the lineNumber
      */
     public long getLineNumber() {
-        return LineNumber;
+        return lineNumber;
     }
 
     /*
@@ -143,14 +148,8 @@ public class CTFCallsite implements Comparable<CTFCallsite> {
         return 0;
     }
 
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#toString()
-     */
     @Override
     public String toString() {
-        return FileName + "/" + FunctionName + ":" + LineNumber; //$NON-NLS-1$ //$NON-NLS-2$
+        return fileName + "/" + functionName + ":" + lineNumber; //$NON-NLS-1$ //$NON-NLS-2$
     }
 }