Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
34a17a9
add test file
itsAlexNguyen Sep 25, 2019
7e7e443
fix
itsAlexNguyen Sep 25, 2019
ac3dcc6
remove conflict
itsAlexNguyen Sep 25, 2019
8b2f8eb
Update Example_v0.java
itsAlexNguyen Sep 25, 2019
faa2edc
Update Example_v0.java
itsAlexNguyen Nov 11, 2019
3ff83f6
Merge branch 'master' of https://github.com/itsAlexNguyen/samples int…
itsAlexNguyen Nov 11, 2019
e3f6794
Merge branch 'master' of https://github.com/itsAlexNguyen/samples int…
itsAlexNguyen Nov 11, 2019
16ecf59
Merge branch 'master' of https://github.com/itsAlexNguyen/samples int…
itsAlexNguyen Nov 11, 2019
64a6bba
Merge branch 'master' of https://github.com/itsAlexNguyen/samples int…
itsAlexNguyen Nov 11, 2019
2338a2d
Merge branch 'master' of https://github.com/itsAlexNguyen/samples int…
itsAlexNguyen Nov 11, 2019
5974e2f
Merge branch 'master' of https://github.com/itsAlexNguyen/samples int…
itsAlexNguyen Nov 11, 2019
2a22deb
Merge branch 'master' of https://github.com/itsAlexNguyen/samples int…
itsAlexNguyen Nov 11, 2019
224a1e8
Update Example_v0.java
itsAlexNguyen Nov 12, 2019
5685108
Update Example_v0.java
itsAlexNguyen Nov 12, 2019
e51c1af
Update Example_v0.java
itsAlexNguyen Nov 12, 2019
1e64b7a
Update Example_v0.java
itsAlexNguyen Nov 12, 2019
78ba7ea
Update Example_v0.java
itsAlexNguyen Nov 12, 2019
2d773bf
Create Example V2
phillippavlich Dec 30, 2019
24c9a4b
alter example v2
phillippavlich Dec 30, 2019
dd083e4
modify 1st file in patch
phillippavlich Dec 30, 2019
23424e1
Merge pull request #6 from itsAlexNguyen/phillippavlich-patch-2
itsAlexNguyen Jan 4, 2020
6f7cceb
create A example
phillippavlich Mar 18, 2020
3483da3
Create BExample.java
phillippavlich Mar 18, 2020
f9463cd
Create CExample.java
phillippavlich Mar 18, 2020
6f5bbda
Update Example_v0.java
patel-nikhil Apr 11, 2020
04f1ce3
v0 update so no two identical methods
phillippavlich Apr 11, 2020
30259e6
v0 tweaks
phillippavlich Apr 11, 2020
d025c54
v0 import mods
phillippavlich Apr 11, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions AExample
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
public int x = 6;
1 change: 1 addition & 0 deletions BExample.java
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
public String cool = "new comment";
36 changes: 26 additions & 10 deletions Example_v0.java
Original file line number Diff line number Diff line change
@@ -1,19 +1,35 @@
package controller;

import java.util.Random;
package mypack;

public class A {
private static int Z;
private static int X;
private static int Y = 5;

public A() {
A.Z = 5;
public A(){
A.X = 5;
}


/** Javadoc for fcn **/
public int fcn(){
return A.Z * 5;
return A.X * A.Y;
}

public int test(){
return A.Z * 5;
return A.X * A.Y;
}

public int test2(){
return 15 + 26;
}

public int test3(){
return 999 - 25;
}

public int test4(){
return 999 - 25;
}

public String printHello(){
return "Hello World!";
}
}
20 changes: 20 additions & 0 deletions Example_v1.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import java.util.List;
import java.util.regex.*;

public class B {
private static int first;
private static int second = 5;
private static int third = 52;

public B(){
B.first = 21;
}

public int add(){
return B.first + B.second;
}

public int mult(){
return B.first * B.second;
}
}
1 change: 1 addition & 0 deletions Other Files/CExample.java
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
public int phil =9;