Skip to content

Commit

Permalink
chore(spgroup#31): add comments to samples
Browse files Browse the repository at this point in the history
  • Loading branch information
barbosamaatheus committed Dec 11, 2020
1 parent 7e36e2a commit 828f98c
Show file tree
Hide file tree
Showing 10 changed files with 10 additions and 9 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package br.unb.cic.analysis.samples;

// Conflict: [left, m():7] --> [right, foo():13]
public class OverridingAssignmentClassFieldConflictInterProceduralSample {
private int x;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package br.unb.cic.analysis.samples;


// Conflict: [left, foo():13] --> [right, bar():17]
public class OverridingAssignmentClassFieldConflictInterProceduralSample2 {
private int x;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package br.unb.cic.analysis.samples;


// Not Conflict
public class OverridingAssignmentClassFieldNotConflictInterProceduralSample {
private int x;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package br.unb.cic.analysis.samples;


// Not Conflict
public class OverridingAssignmentClassFieldNotConflictInterProceduralSample2 {
private int x;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package br.unb.cic.analysis.samples;


// Not Conflict
public class OverridingAssignmentClassFieldWithParameterNotConflictInterProceduralSample {
private int x;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package br.unb.cic.analysis.samples;


// Not Conflict
public class OverridingAssignmentLocalVariablesNotConflictInterProceduralSample {
public void m() {
foo(); // LEFT
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package br.unb.cic.analysis.samples;


// Not Conflict
public class OverridingAssignmentLocalVariablesNotConflictInterProceduralSample2 {
public void m() {
int x = 0; // LEFT
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package br.unb.cic.analysis.samples;


// Not Conflict
public class OverridingAssignmentLocalVariablesWithParameterNotConflictInterProceduralSample {
public void m() {
foo(0); // LEFT
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package br.unb.cic.analysis.samples;


// Conflict: [left, ObjectFieldConflict.m():17] --> [right, ObjectFieldConflict.bar():21]
public class OverridingAssignmentObjectFieldConflictInterProceduralSample {
public void m() {
ObjectFieldConflict c = new ObjectFieldConflict();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package br.unb.cic.analysis.samples;


// Not Conflict
public class OverridingAssignmentObjectFieldNotConflictInterProceduralSample {
public void m() {
ObjectFieldNotConflict objectFieldNotConflict = new ObjectFieldNotConflict();
Expand Down

0 comments on commit 828f98c

Please sign in to comment.