diff options
Diffstat (limited to 'gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse')
27 files changed, 1128 insertions, 1128 deletions
diff --git a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/Activator.java b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/Activator.java index a2e1dc0cff..0c3744f4ff 100644 --- a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/Activator.java +++ b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/Activator.java @@ -19,44 +19,44 @@ import org.osgi.framework.BundleContext; */ public class Activator extends AbstractUIPlugin { - // The plug-in ID - public static final String PLUGIN_ID = "org.eclipse.linuxtools.gcov.core"; //$NON-NLS-1$ - - // The shared instance - private static Activator plugin; - - /** - * The constructor - */ - public Activator() { - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) - */ - @Override - public void start(BundleContext context) throws Exception { - super.start(context); - plugin = this; - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) - */ - @Override - public void stop(BundleContext context) throws Exception { - plugin = null; - super.stop(context); - } - - /** - * Returns the shared instance - * - * @return the shared instance - */ - public static Activator getDefault() { - return plugin; - } + // The plug-in ID + public static final String PLUGIN_ID = "org.eclipse.linuxtools.gcov.core"; //$NON-NLS-1$ + + // The shared instance + private static Activator plugin; + + /** + * The constructor + */ + public Activator() { + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) + */ + @Override + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) + */ + @Override + public void stop(BundleContext context) throws Exception { + plugin = null; + super.stop(context); + } + + /** + * Returns the shared instance + * + * @return the shared instance + */ + public static Activator getDefault() { + return plugin; + } } diff --git a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/action/SwitchContentProviderAction.java b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/action/SwitchContentProviderAction.java index 395450aca8..9e084d2fd2 100644 --- a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/action/SwitchContentProviderAction.java +++ b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/action/SwitchContentProviderAction.java @@ -18,28 +18,28 @@ import org.eclipse.linuxtools.internal.gcov.Activator; import org.eclipse.ui.plugin.AbstractUIPlugin; - /** - * This action changes the content provider - */ + /** + * This action changes the content provider + */ - public class SwitchContentProviderAction extends Action { + public class SwitchContentProviderAction extends Action { - private final ColumnViewer viewer; - private final IContentProvider provider; + private final ColumnViewer viewer; + private final IContentProvider provider; - public SwitchContentProviderAction(String name, String iconPath, ColumnViewer viewer, IContentProvider provider) { - super(name, AS_RADIO_BUTTON); - this.setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin(Activator.PLUGIN_ID, iconPath)); - this.setToolTipText(name); - this.viewer = viewer; - this.provider = provider; - } + public SwitchContentProviderAction(String name, String iconPath, ColumnViewer viewer, IContentProvider provider) { + super(name, AS_RADIO_BUTTON); + this.setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin(Activator.PLUGIN_ID, iconPath)); + this.setToolTipText(name); + this.viewer = viewer; + this.provider = provider; + } - @Override - public void run() { - viewer.getControl().setRedraw(false); - viewer.setContentProvider(provider); - ((TreeViewer)viewer).expandToLevel(2); - viewer.getControl().setRedraw(true); - } - }
\ No newline at end of file + @Override + public void run() { + viewer.getControl().setRedraw(false); + viewer.setContentProvider(provider); + ((TreeViewer)viewer).expandToLevel(2); + viewer.getControl().setRedraw(true); + } + }
\ No newline at end of file diff --git a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/dialog/Messages.java b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/dialog/Messages.java index 8b8961aebd..dd402d2f85 100644 --- a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/dialog/Messages.java +++ b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/dialog/Messages.java @@ -13,27 +13,27 @@ package org.eclipse.linuxtools.internal.gcov.dialog; import org.eclipse.osgi.util.NLS; public class Messages extends NLS { - private static final String BUNDLE_NAME = "org.eclipse.linuxtools.internal.gcov.dialog.messages"; //$NON-NLS-1$ - public static String OpenGCDialog_bin_browser_button_text; - public static String OpenGCDialog_bin_browser_fs_button_text; - public static String OpenGCDialog_bin_browser_handler_text; - public static String OpenGCDialog_no_bin_error_label; - public static String OpenGCDialog_bin_dne_error_label; - public static String OpenGCDialog_bin_group_header; - public static String OpenGCDialog_bin_group_label; - public static String OpenGCDialog_bin_group_tooltip; - public static String OpenGCDialog_coverage_mode_header; - public static String OpenGCDialog_coverage_mode_tooltip; - public static String OpenGCDialog_invalid_bin_error_title; - public static String OpenGCDialog_invalid_bin_error_message; - public static String OpenGCDialog_open_results; - public static String OpenGCDialog_summ_button_text; - public static String OpenGCDialog_open_file_button_text; - static { - // initialize resource bundle - NLS.initializeMessages(BUNDLE_NAME, Messages.class); - } + private static final String BUNDLE_NAME = "org.eclipse.linuxtools.internal.gcov.dialog.messages"; //$NON-NLS-1$ + public static String OpenGCDialog_bin_browser_button_text; + public static String OpenGCDialog_bin_browser_fs_button_text; + public static String OpenGCDialog_bin_browser_handler_text; + public static String OpenGCDialog_no_bin_error_label; + public static String OpenGCDialog_bin_dne_error_label; + public static String OpenGCDialog_bin_group_header; + public static String OpenGCDialog_bin_group_label; + public static String OpenGCDialog_bin_group_tooltip; + public static String OpenGCDialog_coverage_mode_header; + public static String OpenGCDialog_coverage_mode_tooltip; + public static String OpenGCDialog_invalid_bin_error_title; + public static String OpenGCDialog_invalid_bin_error_message; + public static String OpenGCDialog_open_results; + public static String OpenGCDialog_summ_button_text; + public static String OpenGCDialog_open_file_button_text; + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } - private Messages() { - } + private Messages() { + } } diff --git a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/model/AbstractTreeElement.java b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/model/AbstractTreeElement.java index de4eb6a664..d1b4784acd 100644 --- a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/model/AbstractTreeElement.java +++ b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/model/AbstractTreeElement.java @@ -14,78 +14,78 @@ import java.util.LinkedList; public abstract class AbstractTreeElement implements TreeElement{ - /** - * - */ - private static final long serialVersionUID = -4911602250295116203L; - private final TreeElement parent; - private final LinkedList<TreeElement> children = new LinkedList<>(); - private final String name; - private final int totalLines; - private final int executedLines; - private final int instrumentedLines; - - public AbstractTreeElement(TreeElement parent, String name, int totalLines, - int executedLines, int instrumentedLines) { - this.parent = parent; - this.name = name; - this.totalLines = totalLines; - this.executedLines = executedLines; - this.instrumentedLines = instrumentedLines; - } - - @Override - public TreeElement getParent() { - return parent; - } - - @Override - public boolean hasChildren() { - return (children.size()>0); - } + /** + * + */ + private static final long serialVersionUID = -4911602250295116203L; + private final TreeElement parent; + private final LinkedList<TreeElement> children = new LinkedList<>(); + private final String name; + private final int totalLines; + private final int executedLines; + private final int instrumentedLines; - @Override - public LinkedList<? extends TreeElement> getChildren() { - return children; - } + public AbstractTreeElement(TreeElement parent, String name, int totalLines, + int executedLines, int instrumentedLines) { + this.parent = parent; + this.name = name; + this.totalLines = totalLines; + this.executedLines = executedLines; + this.instrumentedLines = instrumentedLines; + } - @Override - public String getName() { - return name; - } - - @Override - public TreeElement getRoot() { - if (parent == null) { - return this; - } - return parent.getRoot(); - } + @Override + public TreeElement getParent() { + return parent; + } - @Override - public int getExecutedLines() { - return executedLines; - } - - @Override - public int getInstrumentedLines() { - return instrumentedLines; - } + @Override + public boolean hasChildren() { + return (children.size()>0); + } - @Override - public float getCoveragePercentage() { - if (instrumentedLines !=0 ) { - return (100.f*executedLines)/(instrumentedLines); - } - else return 0; - } + @Override + public LinkedList<? extends TreeElement> getChildren() { + return children; + } - public void addChild(TreeElement child){ - children.add(child); - } - - @Override - public int getTotalLines() { - return totalLines; - } + @Override + public String getName() { + return name; + } + + @Override + public TreeElement getRoot() { + if (parent == null) { + return this; + } + return parent.getRoot(); + } + + @Override + public int getExecutedLines() { + return executedLines; + } + + @Override + public int getInstrumentedLines() { + return instrumentedLines; + } + + @Override + public float getCoveragePercentage() { + if (instrumentedLines !=0 ) { + return (100.f*executedLines)/(instrumentedLines); + } + else return 0; + } + + public void addChild(TreeElement child){ + children.add(child); + } + + @Override + public int getTotalLines() { + return totalLines; + } }
\ No newline at end of file diff --git a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/model/CovFileTreeElement.java b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/model/CovFileTreeElement.java index 82a1d4e38b..69c24c2156 100644 --- a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/model/CovFileTreeElement.java +++ b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/model/CovFileTreeElement.java @@ -13,13 +13,13 @@ package org.eclipse.linuxtools.internal.gcov.model; public class CovFileTreeElement extends AbstractTreeElement { - /** - * - */ - private static final long serialVersionUID = -5017234616535899796L; + /** + * + */ + private static final long serialVersionUID = -5017234616535899796L; - public CovFileTreeElement(TreeElement parent, - String name, int totalLines, int executedLines, int instrumentedLines) { - super(parent, name, totalLines, executedLines, instrumentedLines); - } + public CovFileTreeElement(TreeElement parent, + String name, int totalLines, int executedLines, int instrumentedLines) { + super(parent, name, totalLines, executedLines, instrumentedLines); + } } diff --git a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/model/CovFolderTreeElement.java b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/model/CovFolderTreeElement.java index 9e9b6c9549..1bd11f4333 100644 --- a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/model/CovFolderTreeElement.java +++ b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/model/CovFolderTreeElement.java @@ -12,13 +12,13 @@ package org.eclipse.linuxtools.internal.gcov.model; public class CovFolderTreeElement extends AbstractTreeElement { - /** - * - */ - private static final long serialVersionUID = 583359546284716138L; + /** + * + */ + private static final long serialVersionUID = 583359546284716138L; - public CovFolderTreeElement(TreeElement parent, - String name, int totalLines, int executedLines, int instrumentedLines) { - super(parent, name, totalLines, executedLines, instrumentedLines); - } + public CovFolderTreeElement(TreeElement parent, + String name, int totalLines, int executedLines, int instrumentedLines) { + super(parent, name, totalLines, executedLines, instrumentedLines); + } } diff --git a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/model/CovFunctionTreeElement.java b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/model/CovFunctionTreeElement.java index 239ac02bcd..31e06af866 100644 --- a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/model/CovFunctionTreeElement.java +++ b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/model/CovFunctionTreeElement.java @@ -14,47 +14,47 @@ import java.util.LinkedList; public class CovFunctionTreeElement extends AbstractTreeElement { - - /** - * - */ - private static final long serialVersionUID = -2025221943523670378L; - private final String sourceFilePath; - private final long firstLnNmbr; - - public CovFunctionTreeElement(TreeElement parent, String name, String sourceFilePath, - long firstLnNmbr, int executedLines, int instrumentedLines) { - super(parent, name, -1, executedLines, instrumentedLines); - this.sourceFilePath = sourceFilePath; - this.firstLnNmbr = firstLnNmbr; - } - - - /* no children for functions*/ - - @Override - public boolean hasChildren() { - return false; - } - - @Override - public LinkedList<? extends TreeElement> getChildren() { - return null; - } - - @Override - public void addChild(TreeElement child){ - } - - - /* specific methods for functions*/ - - public String getSourceFilePath() { - return sourceFilePath; - } - - public long getFirstLnNmbr() { - return firstLnNmbr; - } - + + /** + * + */ + private static final long serialVersionUID = -2025221943523670378L; + private final String sourceFilePath; + private final long firstLnNmbr; + + public CovFunctionTreeElement(TreeElement parent, String name, String sourceFilePath, + long firstLnNmbr, int executedLines, int instrumentedLines) { + super(parent, name, -1, executedLines, instrumentedLines); + this.sourceFilePath = sourceFilePath; + this.firstLnNmbr = firstLnNmbr; + } + + + /* no children for functions*/ + + @Override + public boolean hasChildren() { + return false; + } + + @Override + public LinkedList<? extends TreeElement> getChildren() { + return null; + } + + @Override + public void addChild(TreeElement child){ + } + + + /* specific methods for functions*/ + + public String getSourceFilePath() { + return sourceFilePath; + } + + public long getFirstLnNmbr() { + return firstLnNmbr; + } + } diff --git a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/model/CovRootTreeElement.java b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/model/CovRootTreeElement.java index 51646602a2..d86e561d1c 100644 --- a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/model/CovRootTreeElement.java +++ b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/model/CovRootTreeElement.java @@ -13,13 +13,13 @@ package org.eclipse.linuxtools.internal.gcov.model; public class CovRootTreeElement extends AbstractTreeElement { - /** - * - */ - private static final long serialVersionUID = 877070271548608926L; + /** + * + */ + private static final long serialVersionUID = 877070271548608926L; - public CovRootTreeElement(String name, int totalLines, int executedLines, - int instrumentedLines) { - super(null, name, totalLines, executedLines, instrumentedLines); - } + public CovRootTreeElement(String name, int totalLines, int executedLines, + int instrumentedLines) { + super(null, name, totalLines, executedLines, instrumentedLines); + } } diff --git a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/model/TreeElement.java b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/model/TreeElement.java index ee6d708e6a..7e99c4d848 100644 --- a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/model/TreeElement.java +++ b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/model/TreeElement.java @@ -14,14 +14,14 @@ import java.io.Serializable; import java.util.LinkedList; public interface TreeElement extends Serializable{ - TreeElement getParent(); - LinkedList<? extends TreeElement> getChildren(); - boolean hasChildren(); - TreeElement getRoot(); + TreeElement getParent(); + LinkedList<? extends TreeElement> getChildren(); + boolean hasChildren(); + TreeElement getRoot(); - String getName(); - int getExecutedLines(); - int getInstrumentedLines(); - int getTotalLines(); - float getCoveragePercentage(); + String getName(); + int getExecutedLines(); + int getInstrumentedLines(); + int getTotalLines(); + float getCoveragePercentage(); } diff --git a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/Arc.java b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/Arc.java index 6323c8cbea..7db610d4ac 100644 --- a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/Arc.java +++ b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/Arc.java @@ -15,117 +15,117 @@ import java.util.List; public class Arc implements Serializable{ - /** - * - */ - private static final long serialVersionUID = 4104429137191407662L; - - private static final int VCOV_ARC_ON_TREE = (1 << 0); - private static final int VCOV_ARC_FAKE = (1 << 1); - private static final int VCOV_ARC_FALLTHROUGH = (1 << 2); - - private final Block srcBlock; - private final Block dstnatnBlock; - private final long flag; - private final boolean fake; - private final boolean onTree; - private final boolean fallthrough; - - private long count = 0; - private boolean countValid = false; - private boolean isCallNonReturn = false; // Arc is for a function that abnormally returns - private boolean isNonLoclaReturn = false; // Arc is for catch/setjump - private boolean isUnconditionnal = false; // Is an unconditional branch. - - /** - * Constructor - */ - public Arc(int srcBlockIndice, int dstnatnBlockIndice, long flag, List<Block> otherArcParams) { - this.flag = flag; - this.dstnatnBlock = otherArcParams.get(dstnatnBlockIndice); - this.srcBlock = otherArcParams.get(srcBlockIndice); - this.count = 0; - this.countValid = false; - if ((flag & VCOV_ARC_ON_TREE) != 0) { - onTree = true; - fake = false; - fallthrough = false; - } else if ((flag & VCOV_ARC_FAKE) != 0) { - onTree = false; - fake = true; - fallthrough = true; - } else if ((flag & VCOV_ARC_FALLTHROUGH) != 0) { - onTree = false; - fake = false; - fallthrough = true; - } else { - onTree = false; - fake = false; - fallthrough = false; - } - } - - public Block getDstnatnBlock() { - return dstnatnBlock; - } - - public long getFlag() { - return flag; - } - - public boolean isFake() { - return fake; - } - - public boolean isOnTree() { - return onTree; - } - - public boolean isFallthrough() { - return fallthrough; - } - - public boolean isUnconditionnal() { - return isUnconditionnal; - } - - public boolean isNonLoclaReturn() { - return isNonLoclaReturn; - } - - public boolean isCallNonReturn() { - return isCallNonReturn; - } - - public void setCallNonReturn(boolean isCallNonReturn) { - this.isCallNonReturn = isCallNonReturn; - } - - public void setNonLoclaReturn(boolean isNonLoclaReturn) { - this.isNonLoclaReturn = isNonLoclaReturn; - } - - public void setUnconditionnal(boolean isUnconditionnal) { - this.isUnconditionnal = isUnconditionnal; - } - - public Block getSrcBlock() { - return srcBlock; - } - - public void setCount(long count) { - this.count = count; - } - - public void setCountValid(boolean countValid) { - this.countValid = countValid; - } - - public long getCount() { - return count; - } - - public boolean isCountValid() { - return countValid; - } + /** + * + */ + private static final long serialVersionUID = 4104429137191407662L; + + private static final int VCOV_ARC_ON_TREE = (1 << 0); + private static final int VCOV_ARC_FAKE = (1 << 1); + private static final int VCOV_ARC_FALLTHROUGH = (1 << 2); + + private final Block srcBlock; + private final Block dstnatnBlock; + private final long flag; + private final boolean fake; + private final boolean onTree; + private final boolean fallthrough; + + private long count = 0; + private boolean countValid = false; + private boolean isCallNonReturn = false; // Arc is for a function that abnormally returns + private boolean isNonLoclaReturn = false; // Arc is for catch/setjump + private boolean isUnconditionnal = false; // Is an unconditional branch. + + /** + * Constructor + */ + public Arc(int srcBlockIndice, int dstnatnBlockIndice, long flag, List<Block> otherArcParams) { + this.flag = flag; + this.dstnatnBlock = otherArcParams.get(dstnatnBlockIndice); + this.srcBlock = otherArcParams.get(srcBlockIndice); + this.count = 0; + this.countValid = false; + if ((flag & VCOV_ARC_ON_TREE) != 0) { + onTree = true; + fake = false; + fallthrough = false; + } else if ((flag & VCOV_ARC_FAKE) != 0) { + onTree = false; + fake = true; + fallthrough = true; + } else if ((flag & VCOV_ARC_FALLTHROUGH) != 0) { + onTree = false; + fake = false; + fallthrough = true; + } else { + onTree = false; + fake = false; + fallthrough = false; + } + } + + public Block getDstnatnBlock() { + return dstnatnBlock; + } + + public long getFlag() { + return flag; + } + + public boolean isFake() { + return fake; + } + + public boolean isOnTree() { + return onTree; + } + + public boolean isFallthrough() { + return fallthrough; + } + + public boolean isUnconditionnal() { + return isUnconditionnal; + } + + public boolean isNonLoclaReturn() { + return isNonLoclaReturn; + } + + public boolean isCallNonReturn() { + return isCallNonReturn; + } + + public void setCallNonReturn(boolean isCallNonReturn) { + this.isCallNonReturn = isCallNonReturn; + } + + public void setNonLoclaReturn(boolean isNonLoclaReturn) { + this.isNonLoclaReturn = isNonLoclaReturn; + } + + public void setUnconditionnal(boolean isUnconditionnal) { + this.isUnconditionnal = isUnconditionnal; + } + + public Block getSrcBlock() { + return srcBlock; + } + + public void setCount(long count) { + this.count = count; + } + + public void setCountValid(boolean countValid) { + this.countValid = countValid; + } + + public long getCount() { + return count; + } + + public boolean isCountValid() { + return countValid; + } } diff --git a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/Block.java b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/Block.java index 4afe47f229..b5c68b46d6 100644 --- a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/Block.java +++ b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/Block.java @@ -15,163 +15,163 @@ import java.util.ArrayList; public class Block implements Serializable{ - /** - * - */ - private static final long serialVersionUID = -7665287885679756014L; - private final ArrayList<Arc> entryArcs = new ArrayList<>(); - private final ArrayList<Arc> exitArcs = new ArrayList<>(); - private final long flag; - private long numSuccs = 0; - private long numPreds = 0; - private long count = 0; - private boolean isCallSite = false;// Does the call - private boolean isCallReturn = false; // Is the return - private boolean isNonLocalReturn = false; - private boolean validChain = false; - private boolean invalidChain = false; - private boolean countValid = false; - private final BlkLine blkline = new BlkLine(); - - /** - * Constructor - */ - public Block(long flag) { - this.flag = flag; - } - - - /* getters & setters */ - public long getFlag() { - return flag; - } - - public ArrayList<Arc> getEntryArcs() { - return entryArcs; - } - - public ArrayList<Arc> getExitArcs() { - return exitArcs; - } - - public boolean isCallSite() { - return isCallSite; - } - - public boolean isCallReturn() { - return isCallReturn; - } - - public boolean isNonLocalReturn() { - return isNonLocalReturn; - } - - public void addEntryArcs(Arc arcEntry) { - this.entryArcs.add(arcEntry); - } - - public void addExitArcs(Arc arcExit) { - this.exitArcs.add(arcExit); - } - - public void setCallSite(boolean isCallSite) { - this.isCallSite = isCallSite; - } - - public void setCallReturn(boolean isCallReturn) { - this.isCallReturn = isCallReturn; - } - - public void setNonLocalReturn(boolean isNonLocalReturn) { - this.isNonLocalReturn = isNonLocalReturn; - } - - public void decNumSuccs() { - this.numSuccs--; - } - - public void decNumPreds() { - this.numPreds--; - } - - public void incNumPreds() { - this.numPreds++; - } - - public void incNumSuccs() { - this.numSuccs++; - } - - public boolean isValidChain() { - return validChain; - } - - public void setValidChain(boolean validChain) { - this.validChain = validChain; - } - - public boolean isInvalidChain() { - return invalidChain; - } - - public void setInvalidChain(boolean invalidChain) { - this.invalidChain = invalidChain; - } - - public long getCount() { - return count; - } - - public void setCount(long count) { - this.count = count; - } - - public void setCountValid(boolean countValid) { - this.countValid = countValid; - } - - public boolean isCountValid() { - return countValid; - } - - public long getNumSuccs() { - return numSuccs; - } - - public long getNumPreds() { - return numPreds; - } - - public void setNumSuccs(long numSuccs) { - this.numSuccs = numSuccs; - } - - public void setNumPreds(long numPreds) { - this.numPreds = numPreds; - } - - public long[] getEncoding() { - return blkline.encoding; - } - - public void setEncoding(long[] lineNos) { - this.blkline.encoding = lineNos; - } - - public int getLineNum() { - return blkline.num; - } - - public void setNumLine(int numline) { - this.blkline.num = numline; - } - - static class BlkLine implements Serializable{ - /** - * - */ - private static final long serialVersionUID = 2757557929188979686L; - public long[] encoding; - public int num; - } + /** + * + */ + private static final long serialVersionUID = -7665287885679756014L; + private final ArrayList<Arc> entryArcs = new ArrayList<>(); + private final ArrayList<Arc> exitArcs = new ArrayList<>(); + private final long flag; + private long numSuccs = 0; + private long numPreds = 0; + private long count = 0; + private boolean isCallSite = false;// Does the call + private boolean isCallReturn = false; // Is the return + private boolean isNonLocalReturn = false; + private boolean validChain = false; + private boolean invalidChain = false; + private boolean countValid = false; + private final BlkLine blkline = new BlkLine(); + + /** + * Constructor + */ + public Block(long flag) { + this.flag = flag; + } + + + /* getters & setters */ + public long getFlag() { + return flag; + } + + public ArrayList<Arc> getEntryArcs() { + return entryArcs; + } + + public ArrayList<Arc> getExitArcs() { + return exitArcs; + } + + public boolean isCallSite() { + return isCallSite; + } + + public boolean isCallReturn() { + return isCallReturn; + } + + public boolean isNonLocalReturn() { + return isNonLocalReturn; + } + + public void addEntryArcs(Arc arcEntry) { + this.entryArcs.add(arcEntry); + } + + public void addExitArcs(Arc arcExit) { + this.exitArcs.add(arcExit); + } + + public void setCallSite(boolean isCallSite) { + this.isCallSite = isCallSite; + } + + public void setCallReturn(boolean isCallReturn) { + this.isCallReturn = isCallReturn; + } + + public void setNonLocalReturn(boolean isNonLocalReturn) { + this.isNonLocalReturn = isNonLocalReturn; + } + + public void decNumSuccs() { + this.numSuccs--; + } + + public void decNumPreds() { + this.numPreds--; + } + + public void incNumPreds() { + this.numPreds++; + } + + public void incNumSuccs() { + this.numSuccs++; + } + + public boolean isValidChain() { + return validChain; + } + + public void setValidChain(boolean validChain) { + this.validChain = validChain; + } + + public boolean isInvalidChain() { + return invalidChain; + } + + public void setInvalidChain(boolean invalidChain) { + this.invalidChain = invalidChain; + } + + public long getCount() { + return count; + } + + public void setCount(long count) { + this.count = count; + } + + public void setCountValid(boolean countValid) { + this.countValid = countValid; + } + + public boolean isCountValid() { + return countValid; + } + + public long getNumSuccs() { + return numSuccs; + } + + public long getNumPreds() { + return numPreds; + } + + public void setNumSuccs(long numSuccs) { + this.numSuccs = numSuccs; + } + + public void setNumPreds(long numPreds) { + this.numPreds = numPreds; + } + + public long[] getEncoding() { + return blkline.encoding; + } + + public void setEncoding(long[] lineNos) { + this.blkline.encoding = lineNos; + } + + public int getLineNum() { + return blkline.num; + } + + public void setNumLine(int numline) { + this.blkline.num = numline; + } + + static class BlkLine implements Serializable{ + /** + * + */ + private static final long serialVersionUID = 2757557929188979686L; + public long[] encoding; + public int num; + } } diff --git a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/CovManager.java b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/CovManager.java index 1c469dad7c..4a59f8cc2c 100644 --- a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/CovManager.java +++ b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/CovManager.java @@ -52,8 +52,8 @@ import org.eclipse.ui.PlatformUI; public class CovManager implements Serializable { /** - * - */ + * + */ private static final long serialVersionUID = 5582066617970911413L; // input private final String binaryPath; @@ -263,9 +263,9 @@ public class CovManager implements Serializable { File dir = null; do { if (postfix.isEmpty()) { - postfix = f.getName(); + postfix = f.getName(); } else { - postfix = f.getName() + File.separator + postfix; + postfix = f.getName() + File.separator + postfix; } f = f.getParentFile(); if (f != null) { @@ -289,7 +289,7 @@ public class CovManager implements Serializable { fg.setText(NLS.bind(Messages.CovManager_No_FilePath_Error, new Object[] { filePath, filename })); String s = fg.open(); if (s == null) { - return null; + return null; } else { f = new File(s).getAbsoluteFile(); addSourceLookup(sourcePath, f, new File(filePath).getAbsoluteFile()); diff --git a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/CoverageInfo.java b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/CoverageInfo.java index 761289ee43..d7b30c27fc 100644 --- a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/CoverageInfo.java +++ b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/CoverageInfo.java @@ -14,39 +14,39 @@ import java.io.Serializable; public class CoverageInfo implements Serializable{ - /** - * - */ - private static final long serialVersionUID = -6067335353999481231L; - - private int linesInstrumented = 0; - private int linesExecuted = 0; - - /** - * Constructor - */ - public CoverageInfo() { - - } - - - /*getters & setters */ - - public int getLinesInstrumented() { - return linesInstrumented; - } - - public int getLinesExecuted() { - return linesExecuted; - } - - public void incLinesInstrumented(){ - this.linesInstrumented++; - } - - public void incLinesExecuted(){ - this.linesExecuted++; - } - - + /** + * + */ + private static final long serialVersionUID = -6067335353999481231L; + + private int linesInstrumented = 0; + private int linesExecuted = 0; + + /** + * Constructor + */ + public CoverageInfo() { + + } + + + /*getters & setters */ + + public int getLinesInstrumented() { + return linesInstrumented; + } + + public int getLinesExecuted() { + return linesExecuted; + } + + public void incLinesInstrumented(){ + this.linesInstrumented++; + } + + public void incLinesExecuted(){ + this.linesExecuted++; + } + + } diff --git a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/Folder.java b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/Folder.java index 65f3d244ae..00f46b6b86 100644 --- a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/Folder.java +++ b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/Folder.java @@ -15,51 +15,51 @@ import java.util.ArrayList; public class Folder implements Serializable { - /** - * - */ - private static final long serialVersionUID = 5155033391199109661L; - private final String path; - private final ArrayList<SourceFile> srcFiles = new ArrayList<>(); - private int numLines = 0; - private int linesInstrumented = 0; - private int linesExecuted = 0; - - /** - * Constructor - */ - public Folder(String path) { - this.path = path; - } - - - public void accumulateSourcesCounts(){ - for (SourceFile srcFile: srcFiles) { - numLines += srcFile.getNumLines(); - linesInstrumented += srcFile.getLinesInstrumented(); - linesExecuted += srcFile.getLinesExecuted(); - } - } - - public String getPath() { - return path; - } - - public ArrayList<SourceFile> getSrcFiles() { - return srcFiles; - } - - public void addSrcFiles(SourceFile srcFile) { - this.srcFiles.add(srcFile); - } - - public int getNumLines() { - return numLines; - } - public int getLinesExecuted() { - return linesExecuted; - } - public int getLinesInstrumented() { - return linesInstrumented; - } + /** + * + */ + private static final long serialVersionUID = 5155033391199109661L; + private final String path; + private final ArrayList<SourceFile> srcFiles = new ArrayList<>(); + private int numLines = 0; + private int linesInstrumented = 0; + private int linesExecuted = 0; + + /** + * Constructor + */ + public Folder(String path) { + this.path = path; + } + + + public void accumulateSourcesCounts(){ + for (SourceFile srcFile: srcFiles) { + numLines += srcFile.getNumLines(); + linesInstrumented += srcFile.getLinesInstrumented(); + linesExecuted += srcFile.getLinesExecuted(); + } + } + + public String getPath() { + return path; + } + + public ArrayList<SourceFile> getSrcFiles() { + return srcFiles; + } + + public void addSrcFiles(SourceFile srcFile) { + this.srcFiles.add(srcFile); + } + + public int getNumLines() { + return numLines; + } + public int getLinesExecuted() { + return linesExecuted; + } + public int getLinesInstrumented() { + return linesInstrumented; + } } diff --git a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/GcnoFunction.java b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/GcnoFunction.java index 54c139c5a7..51c01be56d 100644 --- a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/GcnoFunction.java +++ b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/GcnoFunction.java @@ -16,8 +16,8 @@ import java.util.ArrayList; public class GcnoFunction implements Serializable, Comparable<GcnoFunction> { /** - * - */ + * + */ private static final long serialVersionUID = -4159055012321132651L; private final long ident; diff --git a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/Line.java b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/Line.java index a3fbc5ae34..2629a5f424 100644 --- a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/Line.java +++ b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/Line.java @@ -15,27 +15,27 @@ import java.io.Serializable; public class Line implements Serializable{ - /** */ - private static final long serialVersionUID = 8804878976767948267L; - private boolean exists = false; - private long count = 0; + /** */ + private static final long serialVersionUID = 8804878976767948267L; + private boolean exists = false; + private long count = 0; - /*Getters & setters*/ + /*Getters & setters*/ - public boolean exists() { - return exists; - } + public boolean exists() { + return exists; + } - public void setExists(boolean exists) { - this.exists = exists; - } + public void setExists(boolean exists) { + this.exists = exists; + } - public void setCount(long count) { - this.count = count; - } + public void setCount(long count) { + this.count = count; + } - public long getCount() { - return count; - } + public long getCount() { + return count; + } } diff --git a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/Messages.java b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/Messages.java index b89ebec9af..dd18295eaa 100644 --- a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/Messages.java +++ b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/Messages.java @@ -13,28 +13,28 @@ package org.eclipse.linuxtools.internal.gcov.parser; import org.eclipse.osgi.util.NLS; public class Messages extends NLS { - private static final String BUNDLE_NAME = "org.eclipse.linuxtools.internal.gcov.parser.messages"; //$NON-NLS-1$ - public static String CovManager_Parsing_Done; - public static String CovManager_Retrieval_Error; - public static String CovManager_Strings; - public static String CovManager_Summary; - public static String CovManager_No_Funcs_Error; - public static String CovManager_No_FilePath_Error; + private static final String BUNDLE_NAME = "org.eclipse.linuxtools.internal.gcov.parser.messages"; //$NON-NLS-1$ + public static String CovManager_Parsing_Done; + public static String CovManager_Retrieval_Error; + public static String CovManager_Strings; + public static String CovManager_Summary; + public static String CovManager_No_Funcs_Error; + public static String CovManager_No_FilePath_Error; - public static String GcdaRecordsParser_content_inconsistent; - public static String GcdaRecordsParser_func_block_empty; - public static String GcdaRecordsParser_func_counter_error; - public static String GcdaRecordsParser_magic_num_error; - public static String GcdaRecordsParser_checksum_error; - public static String GcdaRecordsParser_func_not_found; - public static String GcnoRecordsParser_null_string; - public static String GcnoRecordsParser_magic_num_error; + public static String GcdaRecordsParser_content_inconsistent; + public static String GcdaRecordsParser_func_block_empty; + public static String GcdaRecordsParser_func_counter_error; + public static String GcdaRecordsParser_magic_num_error; + public static String GcdaRecordsParser_checksum_error; + public static String GcdaRecordsParser_func_not_found; + public static String GcnoRecordsParser_null_string; + public static String GcnoRecordsParser_magic_num_error; - static { - // initialize resource bundle - NLS.initializeMessages(BUNDLE_NAME, Messages.class); - } + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } - private Messages() { - } + private Messages() { + } } diff --git a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/SourceFile.java b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/SourceFile.java index 8544a5ca12..b2ac834160 100644 --- a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/SourceFile.java +++ b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/SourceFile.java @@ -17,96 +17,96 @@ import java.util.TreeSet; public class SourceFile implements Serializable { - /** - * - */ - private static final long serialVersionUID = -9182882194956475711L; - private final String name; - private final int index; - private final ArrayList<Line> lines = new ArrayList<>(); - private final TreeSet<GcnoFunction> fnctns = new TreeSet<>(); - private int numLines = 1; - private final CoverageInfo cvrge = new CoverageInfo(); - private long maxCount = -1; - - /** - * Constructor - */ - public SourceFile(String name, int index) { - this.name = name; - this.index = index; - } - - - public void accumulateLineCounts() { - for (Line line : lines) { - if (line.exists()) { - cvrge.incLinesInstrumented(); - if (line.getCount() != 0) { - cvrge.incLinesExecuted(); - } - } - } - } - - public long getmaxLineCount() { - if (maxCount < 0) { - for (Line line : lines) { - if (line.getCount() > maxCount) { - maxCount = line.getCount(); - } - } - } - return maxCount; - } - - /* getters & setters */ - - - - public int getLinesExecuted() { - return cvrge.getLinesExecuted(); - } - - public int getLinesInstrumented() { - return cvrge.getLinesInstrumented(); - } - - public String getName() { - return name; - } - - public ArrayList<Line> getLines() { - return lines; - } - - public SortedSet<GcnoFunction> getFnctns() { - return fnctns; - } - - public void addFnctn(GcnoFunction fnctn) { - this.fnctns.add(fnctn); - } - - public int getNumLines() { - return numLines; - } - - public void setNumLines(int numLines) { - this.numLines = numLines; - } - - public int getIndex() { - return index; - } - - public void createLines() { - int n = getNumLines(); - lines.ensureCapacity(n); - for (int j = 0; j < n; j++) { - lines.add(new Line()); - } - } - - + /** + * + */ + private static final long serialVersionUID = -9182882194956475711L; + private final String name; + private final int index; + private final ArrayList<Line> lines = new ArrayList<>(); + private final TreeSet<GcnoFunction> fnctns = new TreeSet<>(); + private int numLines = 1; + private final CoverageInfo cvrge = new CoverageInfo(); + private long maxCount = -1; + + /** + * Constructor + */ + public SourceFile(String name, int index) { + this.name = name; + this.index = index; + } + + + public void accumulateLineCounts() { + for (Line line : lines) { + if (line.exists()) { + cvrge.incLinesInstrumented(); + if (line.getCount() != 0) { + cvrge.incLinesExecuted(); + } + } + } + } + + public long getmaxLineCount() { + if (maxCount < 0) { + for (Line line : lines) { + if (line.getCount() > maxCount) { + maxCount = line.getCount(); + } + } + } + return maxCount; + } + + /* getters & setters */ + + + + public int getLinesExecuted() { + return cvrge.getLinesExecuted(); + } + + public int getLinesInstrumented() { + return cvrge.getLinesInstrumented(); + } + + public String getName() { + return name; + } + + public ArrayList<Line> getLines() { + return lines; + } + + public SortedSet<GcnoFunction> getFnctns() { + return fnctns; + } + + public void addFnctn(GcnoFunction fnctn) { + this.fnctns.add(fnctn); + } + + public int getNumLines() { + return numLines; + } + + public void setNumLines(int numLines) { + this.numLines = numLines; + } + + public int getIndex() { + return index; + } + + public void createLines() { + int n = getNumLines(); + lines.ensureCapacity(n); + for (int j = 0; j < n; j++) { + lines.add(new Line()); + } + } + + } diff --git a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/preferences/Messages.java b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/preferences/Messages.java index 10c5ff65e0..79a6dc3ea6 100644 --- a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/preferences/Messages.java +++ b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/preferences/Messages.java @@ -13,19 +13,19 @@ package org.eclipse.linuxtools.internal.gcov.preferences; import org.eclipse.osgi.util.NLS; public class Messages extends NLS { - private static final String BUNDLE_NAME = "org.eclipse.linuxtools.internal.gcov.preferences.messages"; //$NON-NLS-1$ - public static String ColorPreferencePage_BackColorHighest; - public static String ColorPreferencePage_BackColorLowest; - public static String ColorPreferencePage_BackColorNotCovered; - public static String ColorPreferencePage_ColorizeCode; - public static String ColorPreferencePage_Description; - public static String ColorPreferencePage_Title; - public static String ColorPreferencePage_UseGradient; - static { - // initialize resource bundle - NLS.initializeMessages(BUNDLE_NAME, Messages.class); - } + private static final String BUNDLE_NAME = "org.eclipse.linuxtools.internal.gcov.preferences.messages"; //$NON-NLS-1$ + public static String ColorPreferencePage_BackColorHighest; + public static String ColorPreferencePage_BackColorLowest; + public static String ColorPreferencePage_BackColorNotCovered; + public static String ColorPreferencePage_ColorizeCode; + public static String ColorPreferencePage_Description; + public static String ColorPreferencePage_Title; + public static String ColorPreferencePage_UseGradient; + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } - private Messages() { - } + private Messages() { + } } diff --git a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/utils/BEDataInputStream.java b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/utils/BEDataInputStream.java index e4baf5ab2e..2654767960 100644 --- a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/utils/BEDataInputStream.java +++ b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/utils/BEDataInputStream.java @@ -18,67 +18,67 @@ import java.io.IOException; */ public class BEDataInputStream implements DataInput { - private final DataInputStream in; - private final byte[] buffer = new byte[8]; - - /** - * Constructor - * @param in - */ - public BEDataInputStream(DataInputStream in) { - this.in = in; - } - - - /* - * (non-Javadoc) - * @see java.io.DataInput#readShort() - */ - @Override - public final short readShort() throws IOException - { - return in.readShort(); - } - - /* - * (non-Javadoc) - * @see java.io.DataInput#readUnsignedShort() - */ - @Override - public final int readUnsignedShort() throws IOException - { - return in.readUnsignedShort(); - } - - /* - * (non-Javadoc) - * @see java.io.DataInput#readChar() - */ - @Override - public final char readChar() throws IOException - { - return in.readChar(); - } - - /* - * (non-Javadoc) - * @see java.io.DataInput#readInt() - */ - @Override - public final int readInt() throws IOException - { - return in.readInt(); - } - - /* - * (non-Javadoc) - * @see java.io.DataInput#readLong() - */ - @Override - public final long readLong() throws IOException - { - in.readFully(buffer, 0, 8); - return (((long)buffer[7] << 32) + + private final DataInputStream in; + private final byte[] buffer = new byte[8]; + + /** + * Constructor + * @param in + */ + public BEDataInputStream(DataInputStream in) { + this.in = in; + } + + + /* + * (non-Javadoc) + * @see java.io.DataInput#readShort() + */ + @Override + public final short readShort() throws IOException + { + return in.readShort(); + } + + /* + * (non-Javadoc) + * @see java.io.DataInput#readUnsignedShort() + */ + @Override + public final int readUnsignedShort() throws IOException + { + return in.readUnsignedShort(); + } + + /* + * (non-Javadoc) + * @see java.io.DataInput#readChar() + */ + @Override + public final char readChar() throws IOException + { + return in.readChar(); + } + + /* + * (non-Javadoc) + * @see java.io.DataInput#readInt() + */ + @Override + public final int readInt() throws IOException + { + return in.readInt(); + } + + /* + * (non-Javadoc) + * @see java.io.DataInput#readLong() + */ + @Override + public final long readLong() throws IOException + { + in.readFully(buffer, 0, 8); + return (((long)buffer[7] << 32) + ((long)(buffer[6] & 255) << 40) + ((long)(buffer[5] & 255) << 48) + ((long)(buffer[4] & 255) << 56) + @@ -86,120 +86,120 @@ public class BEDataInputStream implements DataInput { ((buffer[2] & 255) << 8) + ((buffer[1] & 255) << 16) + ((buffer[0] & 255) << 24)); - } - - /* - * (non-Javadoc) - * @see java.io.DataInput#readFloat() - */ - @Override - public final float readFloat() throws IOException - { - return Float.intBitsToFloat(readInt()); - } - - /* - * (non-Javadoc) - * @see java.io.DataInput#readDouble() - */ - @Override - public final double readDouble() throws IOException - { - return Double.longBitsToDouble(readLong()); - } - - /* - * (non-Javadoc) - * @see java.io.DataInput#readBoolean() - */ - @Override - public boolean readBoolean() throws IOException { - return in.readBoolean(); - } - - /* - * (non-Javadoc) - * @see java.io.DataInput#readByte() - */ - @Override - public byte readByte() throws IOException { - return in.readByte(); - } - - /* - * (non-Javadoc) - * @see java.io.DataInput#readFully(byte[]) - */ - @Override - public void readFully(byte[] b) throws IOException { - in.readFully(b); - } - - /* - * (non-Javadoc) - * @see java.io.DataInput#readFully(byte[], int, int) - */ - @Override - public void readFully(byte[] b, int off, int len) throws IOException { - in.readFully(b,off,len); - } - - /* - * (non-Javadoc) - * @see java.io.DataInput#readLine() - */ - @Override - @Deprecated - public String readLine() throws IOException { - return in.readLine(); - } - - /* - * (non-Javadoc) - * @see java.io.DataInput#readUTF() - */ - @Override - public String readUTF() throws IOException { - return in.readUTF(); - } - - /* - * (non-Javadoc) - * @see java.io.DataInput#readUnsignedByte() - */ - @Override - public int readUnsignedByte() throws IOException { - return in.readUnsignedByte(); - } - - /* - * (non-Javadoc) - * @see java.io.DataInput#skipBytes(int) - */ - @Override - public int skipBytes(int n) throws IOException { - return in.skipBytes(n); - } - - /** - * Close this stream. - */ - public void close() throws IOException { - in.close(); - } - - public final long readUnsignedInt() throws IOException - { - in.readFully(buffer, 0, 4); - return - (( - (buffer[0]) << 24 | - (buffer[1]&0xff) << 16 | - (buffer[2]&0xff) << 8 | - (buffer[3]&0xff) - ) - & MasksGenerator.UNSIGNED_INT_MASK ); - } + } + + /* + * (non-Javadoc) + * @see java.io.DataInput#readFloat() + */ + @Override + public final float readFloat() throws IOException + { + return Float.intBitsToFloat(readInt()); + } + + /* + * (non-Javadoc) + * @see java.io.DataInput#readDouble() + */ + @Override + public final double readDouble() throws IOException + { + return Double.longBitsToDouble(readLong()); + } + + /* + * (non-Javadoc) + * @see java.io.DataInput#readBoolean() + */ + @Override + public boolean readBoolean() throws IOException { + return in.readBoolean(); + } + + /* + * (non-Javadoc) + * @see java.io.DataInput#readByte() + */ + @Override + public byte readByte() throws IOException { + return in.readByte(); + } + + /* + * (non-Javadoc) + * @see java.io.DataInput#readFully(byte[]) + */ + @Override + public void readFully(byte[] b) throws IOException { + in.readFully(b); + } + + /* + * (non-Javadoc) + * @see java.io.DataInput#readFully(byte[], int, int) + */ + @Override + public void readFully(byte[] b, int off, int len) throws IOException { + in.readFully(b,off,len); + } + + /* + * (non-Javadoc) + * @see java.io.DataInput#readLine() + */ + @Override + @Deprecated + public String readLine() throws IOException { + return in.readLine(); + } + + /* + * (non-Javadoc) + * @see java.io.DataInput#readUTF() + */ + @Override + public String readUTF() throws IOException { + return in.readUTF(); + } + + /* + * (non-Javadoc) + * @see java.io.DataInput#readUnsignedByte() + */ + @Override + public int readUnsignedByte() throws IOException { + return in.readUnsignedByte(); + } + + /* + * (non-Javadoc) + * @see java.io.DataInput#skipBytes(int) + */ + @Override + public int skipBytes(int n) throws IOException { + return in.skipBytes(n); + } + + /** + * Close this stream. + */ + public void close() throws IOException { + in.close(); + } + + public final long readUnsignedInt() throws IOException + { + in.readFully(buffer, 0, 4); + return + (( + (buffer[0]) << 24 | + (buffer[1]&0xff) << 16 | + (buffer[2]&0xff) << 8 | + (buffer[3]&0xff) + ) + & MasksGenerator.UNSIGNED_INT_MASK ); + } diff --git a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/utils/MasksGenerator.java b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/utils/MasksGenerator.java index eb8a61ba9d..63330ae1e9 100644 --- a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/utils/MasksGenerator.java +++ b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/utils/MasksGenerator.java @@ -11,5 +11,5 @@ package org.eclipse.linuxtools.internal.gcov.utils; public class MasksGenerator { - public static final long UNSIGNED_INT_MASK = 0xffffffffL; + public static final long UNSIGNED_INT_MASK = 0xffffffffL; } diff --git a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/view/CovFileContentProvider.java b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/view/CovFileContentProvider.java index 2bdf41efae..bcb8d1f02c 100644 --- a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/view/CovFileContentProvider.java +++ b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/view/CovFileContentProvider.java @@ -20,41 +20,41 @@ import org.eclipse.linuxtools.internal.gcov.model.TreeElement; public class CovFileContentProvider extends CovFolderContentProvider { - public static final CovFileContentProvider sharedInstance = new CovFileContentProvider(); - - /** - * Constructor - */ - protected CovFileContentProvider() { - } - - @Override - public Object[] getChildren(Object parentElement) { - if (parentElement instanceof CovRootTreeElement) { - CovRootTreeElement root = (CovRootTreeElement) parentElement; - LinkedList<? extends TreeElement> ret = getElementChildrenList(root); - return ret.toArray(); - } - return super.getChildren(parentElement); - } - - protected LinkedList<? extends TreeElement> getElementChildrenList(CovRootTreeElement root) { - LinkedList<TreeElement> ret = new LinkedList<>(); - LinkedList<? extends TreeElement> list = root.getChildren(); - for (TreeElement folderlist : list) { - LinkedList<? extends TreeElement> partialList = folderlist.getChildren(); - ret.addAll(partialList); - } - return ret; - } - - @Override - public Object getParent(Object element) { - Object o = super.getParent(element); - if (o instanceof CovFolderTreeElement) { - o = super.getParent(o); - } - return o; - } + public static final CovFileContentProvider sharedInstance = new CovFileContentProvider(); + + /** + * Constructor + */ + protected CovFileContentProvider() { + } + + @Override + public Object[] getChildren(Object parentElement) { + if (parentElement instanceof CovRootTreeElement) { + CovRootTreeElement root = (CovRootTreeElement) parentElement; + LinkedList<? extends TreeElement> ret = getElementChildrenList(root); + return ret.toArray(); + } + return super.getChildren(parentElement); + } + + protected LinkedList<? extends TreeElement> getElementChildrenList(CovRootTreeElement root) { + LinkedList<TreeElement> ret = new LinkedList<>(); + LinkedList<? extends TreeElement> list = root.getChildren(); + for (TreeElement folderlist : list) { + LinkedList<? extends TreeElement> partialList = folderlist.getChildren(); + ret.addAll(partialList); + } + return ret; + } + + @Override + public Object getParent(Object element) { + Object o = super.getParent(element); + if (o instanceof CovFolderTreeElement) { + o = super.getParent(o); + } + return o; + } } diff --git a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/view/CovFolderContentProvider.java b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/view/CovFolderContentProvider.java index 16e872f67e..1915efbb29 100644 --- a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/view/CovFolderContentProvider.java +++ b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/view/CovFolderContentProvider.java @@ -20,57 +20,57 @@ import org.eclipse.linuxtools.internal.gcov.parser.CovManager; public class CovFolderContentProvider implements ITreeContentProvider { - /** Shared instance: this class is implemented as a Singleton */ - public static final CovFolderContentProvider sharedInstance = new CovFolderContentProvider(); + /** Shared instance: this class is implemented as a Singleton */ + public static final CovFolderContentProvider sharedInstance = new CovFolderContentProvider(); - protected CovFolderContentProvider(){ - } + protected CovFolderContentProvider(){ + } - @Override - public Object[] getChildren(Object parentElement) { - if (parentElement instanceof TreeElement) { - TreeElement elem = (TreeElement) parentElement; - LinkedList<? extends TreeElement> list = elem.getChildren(); - if (list != null) - return list.toArray(); - } - return null; - } + @Override + public Object[] getChildren(Object parentElement) { + if (parentElement instanceof TreeElement) { + TreeElement elem = (TreeElement) parentElement; + LinkedList<? extends TreeElement> list = elem.getChildren(); + if (list != null) + return list.toArray(); + } + return null; + } - @Override - public Object getParent(Object element) { - if (element instanceof TreeElement) { - TreeElement elem = (TreeElement) element; - return elem.getParent(); - } - return null; - } + @Override + public Object getParent(Object element) { + if (element instanceof TreeElement) { + TreeElement elem = (TreeElement) element; + return elem.getParent(); + } + return null; + } - @Override - public boolean hasChildren(Object element) { - if (element instanceof TreeElement) { - TreeElement elem = (TreeElement) element; - return elem.hasChildren(); - } - return false; - } + @Override + public boolean hasChildren(Object element) { + if (element instanceof TreeElement) { + TreeElement elem = (TreeElement) element; + return elem.hasChildren(); + } + return false; + } - @Override - public Object[] getElements(Object inputElement) { - if (inputElement instanceof CovManager) { - CovManager cvrgMnger = (CovManager)inputElement; - return new Object[] { - cvrgMnger.getRootNode() - }; - } - return new Object[0]; - } + @Override + public Object[] getElements(Object inputElement) { + if (inputElement instanceof CovManager) { + CovManager cvrgMnger = (CovManager)inputElement; + return new Object[] { + cvrgMnger.getRootNode() + }; + } + return new Object[0]; + } - @Override - public void dispose() { - } + @Override + public void dispose() { + } - @Override - public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { - } + @Override + public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { + } } diff --git a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/view/CovFunctionContentProvider.java b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/view/CovFunctionContentProvider.java index 9b4dabf81d..56b71b8e35 100644 --- a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/view/CovFunctionContentProvider.java +++ b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/view/CovFunctionContentProvider.java @@ -21,33 +21,33 @@ import org.eclipse.linuxtools.internal.gcov.model.TreeElement; public class CovFunctionContentProvider extends CovFileContentProvider { - public static final CovFunctionContentProvider sharedInstance = new CovFunctionContentProvider(); - - /** - * Constructor - */ - protected CovFunctionContentProvider() { - } - - @Override - protected LinkedList<? extends TreeElement> getElementChildrenList(CovRootTreeElement root) { - LinkedList<? extends TreeElement> list = super.getElementChildrenList(root); - LinkedList<TreeElement> ret = new LinkedList<>(); - for (TreeElement histTreeElem : list) { - LinkedList<? extends TreeElement> partialList = histTreeElem.getChildren(); - ret.addAll(partialList); - } - return ret; - } - - - @Override - public Object getParent(Object element) { - Object o = super.getParent(element); - if (o instanceof CovFileTreeElement) { - o = super.getParent(o); - } - return o; - } + public static final CovFunctionContentProvider sharedInstance = new CovFunctionContentProvider(); + + /** + * Constructor + */ + protected CovFunctionContentProvider() { + } + + @Override + protected LinkedList<? extends TreeElement> getElementChildrenList(CovRootTreeElement root) { + LinkedList<? extends TreeElement> list = super.getElementChildrenList(root); + LinkedList<TreeElement> ret = new LinkedList<>(); + for (TreeElement histTreeElem : list) { + LinkedList<? extends TreeElement> partialList = histTreeElem.getChildren(); + ret.addAll(partialList); + } + return ret; + } + + + @Override + public Object getParent(Object element) { + Object o = super.getParent(element); + if (o instanceof CovFileTreeElement) { + o = super.getParent(o); + } + return o; + } }
\ No newline at end of file diff --git a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/view/CovViewer.java b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/view/CovViewer.java index b311a70462..b474157764 100644 --- a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/view/CovViewer.java +++ b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/view/CovViewer.java @@ -35,75 +35,75 @@ import org.eclipse.swt.widgets.Composite; public class CovViewer extends AbstractSTTreeViewer { - private ISTDataViewersField[] fields; + private ISTDataViewersField[] fields; - /** - * Constructor - * @param parent - */ - public CovViewer(Composite parent) { - super(parent, SWT.BORDER | SWT.H_SCROLL| SWT.V_SCROLL | SWT.MULTI | - SWT.FULL_SELECTION); - } + /** + * Constructor + * @param parent + */ + public CovViewer(Composite parent) { + super(parent, SWT.BORDER | SWT.H_SCROLL| SWT.V_SCROLL | SWT.MULTI | + SWT.FULL_SELECTION); + } - @Override - protected IContentProvider createContentProvider() { - return CovFileContentProvider.sharedInstance; + @Override + protected IContentProvider createContentProvider() { + return CovFileContentProvider.sharedInstance; - } + } - @Override - public ISTDataViewersField[] getAllFields() { - if (fields == null) { - fields = new ISTDataViewersField[] { - new FieldName(), - new FieldTotalLines(), - new FieldInstrumentedLines(), - new FieldExecutedLines(), - new FieldCoveragePercentage() }; - } - return fields; - } + @Override + public ISTDataViewersField[] getAllFields() { + if (fields == null) { + fields = new ISTDataViewersField[] { + new FieldName(), + new FieldTotalLines(), + new FieldInstrumentedLines(), + new FieldExecutedLines(), + new FieldCoveragePercentage() }; + } + return fields; + } - @Override - public IDialogSettings getDialogSettings() { - return org.eclipse.linuxtools.internal.gcov.Activator.getDefault().getDialogSettings(); - } + @Override + public IDialogSettings getDialogSettings() { + return org.eclipse.linuxtools.internal.gcov.Activator.getDefault().getDialogSettings(); + } - @Override - protected void handleOpenEvent(OpenEvent event) { + @Override + protected void handleOpenEvent(OpenEvent event) { - IStructuredSelection selection = (IStructuredSelection) event - .getSelection(); - TreeElement element = (TreeElement) selection.getFirstElement(); + IStructuredSelection selection = (IStructuredSelection) event + .getSelection(); + TreeElement element = (TreeElement) selection.getFirstElement(); - if (element != null) { - if (element.getParent() != null) { - String sourceLoc = ""; //$NON-NLS-1$ - long lineNumber = 0; + if (element != null) { + if (element.getParent() != null) { + String sourceLoc = ""; //$NON-NLS-1$ + long lineNumber = 0; - if (element.getClass() == CovFileTreeElement.class) { - sourceLoc = element.getName(); - } else if (element.getClass() == CovFunctionTreeElement.class) { - sourceLoc = ((CovFunctionTreeElement) element).getSourceFilePath(); - lineNumber =((CovFunctionTreeElement)element).getFirstLnNmbr(); - } - CovManager cvm = (CovManager) this.getInput(); - SourceFile sourceFile = cvm.getSourceFile(sourceLoc); - if (sourceFile != null) { - IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot(); - String binaryLoc = cvm.getBinaryPath(); - IPath binaryPath = new Path(binaryLoc); - IFile binary = root.getFileForLocation(binaryPath); - IProject project = null; - if (binary != null) { - project = binary.getProject(); - } + if (element.getClass() == CovFileTreeElement.class) { + sourceLoc = element.getName(); + } else if (element.getClass() == CovFunctionTreeElement.class) { + sourceLoc = ((CovFunctionTreeElement) element).getSourceFilePath(); + lineNumber =((CovFunctionTreeElement)element).getFirstLnNmbr(); + } + CovManager cvm = (CovManager) this.getInput(); + SourceFile sourceFile = cvm.getSourceFile(sourceLoc); + if (sourceFile != null) { + IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot(); + String binaryLoc = cvm.getBinaryPath(); + IPath binaryPath = new Path(binaryLoc); + IFile binary = root.getFileForLocation(binaryPath); + IProject project = null; + if (binary != null) { + project = binary.getProject(); + } - OpenSourceFileAction.openAnnotatedSourceFile(project, - binary, sourceFile, (int)lineNumber); - } - } - } - } + OpenSourceFileAction.openAnnotatedSourceFile(project, + binary, sourceFile, (int)lineNumber); + } + } + } + } } diff --git a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/view/annotatedsource/GcovAnnotationModel.java b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/view/annotatedsource/GcovAnnotationModel.java index cfd5fe7334..03e8e8430d 100644 --- a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/view/annotatedsource/GcovAnnotationModel.java +++ b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/view/annotatedsource/GcovAnnotationModel.java @@ -49,9 +49,9 @@ import org.eclipse.ui.texteditor.ITextEditor; */ public final class GcovAnnotationModel implements IAnnotationModel { - private static final String THOROUGH_COVERAGE = "org.eclipse.linuxtools.gcov.ThoroughCoverageAnnotation"; //$NON-NLS-1$ - private static final String COVERAGE = "org.eclipse.linuxtools.gcov.CoverageAnnotation"; //$NON-NLS-1$ - private static final String NO_COVERAGE = "org.eclipse.linuxtools.gcov.NoCoverageAnnotation"; //$NON-NLS-1$ + private static final String THOROUGH_COVERAGE = "org.eclipse.linuxtools.gcov.ThoroughCoverageAnnotation"; //$NON-NLS-1$ + private static final String COVERAGE = "org.eclipse.linuxtools.gcov.CoverageAnnotation"; //$NON-NLS-1$ + private static final String NO_COVERAGE = "org.eclipse.linuxtools.gcov.NoCoverageAnnotation"; //$NON-NLS-1$ /** Key for identifying our model from other Editor models. */ private static final Object KEY = new Object(); diff --git a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/view/annotatedsource/STAnnotatedSourceNotFoundEditorInput.java b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/view/annotatedsource/STAnnotatedSourceNotFoundEditorInput.java index b3f89e5322..191116aeae 100644 --- a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/view/annotatedsource/STAnnotatedSourceNotFoundEditorInput.java +++ b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/view/annotatedsource/STAnnotatedSourceNotFoundEditorInput.java @@ -18,53 +18,53 @@ import org.eclipse.linuxtools.internal.gcov.parser.SourceFile; public class STAnnotatedSourceNotFoundEditorInput extends STCSourceNotFoundEditorInput { - private final SourceFile sourceFile; - - public STAnnotatedSourceNotFoundEditorInput(IProject project, - SourceFile sourceFile, - IPath sourcePath, int lineNumber) { - super(project, sourcePath, lineNumber); - this.sourceFile = sourceFile; - } + private final SourceFile sourceFile; - /** - * @return the sourceFile - */ - public SourceFile getSourceFile() { - return sourceFile; - } + public STAnnotatedSourceNotFoundEditorInput(IProject project, + SourceFile sourceFile, + IPath sourcePath, int lineNumber) { + super(project, sourcePath, lineNumber); + this.sourceFile = sourceFile; + } - /* (non-Javadoc) - * @see java.lang.Object#hashCode() - */ - @Override - public int hashCode() { - final int prime = 31; - int result = super.hashCode(); - result = prime * result - + ((sourceFile == null) ? 0 : sourceFile.hashCode()); - return result; - } + /** + * @return the sourceFile + */ + public SourceFile getSourceFile() { + return sourceFile; + } - /* (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (!super.equals(obj)) - return false; - if (getClass() != obj.getClass()) - return false; - final STAnnotatedSourceNotFoundEditorInput other = (STAnnotatedSourceNotFoundEditorInput) obj; - if (sourceFile == null) { - if (other.sourceFile != null) { - return false; - } - } else if (!sourceFile.equals(other.sourceFile)) - return false; - return true; - } + /* (non-Javadoc) + * @see java.lang.Object#hashCode() + */ + @Override + public int hashCode() { + final int prime = 31; + int result = super.hashCode(); + result = prime * result + + ((sourceFile == null) ? 0 : sourceFile.hashCode()); + return result; + } + + /* (non-Javadoc) + * @see java.lang.Object#equals(java.lang.Object) + */ + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (!super.equals(obj)) + return false; + if (getClass() != obj.getClass()) + return false; + final STAnnotatedSourceNotFoundEditorInput other = (STAnnotatedSourceNotFoundEditorInput) obj; + if (sourceFile == null) { + if (other.sourceFile != null) { + return false; + } + } else if (!sourceFile.equals(other.sourceFile)) + return false; + return true; + } } |