Skip to content

Commit e29282f

Browse files
committed
naming fixed
1 parent 7942522 commit e29282f

File tree

103 files changed

+3406
-3443
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+3406
-3443
lines changed

.idea/.gitignore

Lines changed: 0 additions & 8 deletions
This file was deleted.

.idea/Javacode.iml

Lines changed: 0 additions & 9 deletions
This file was deleted.

.idea/misc.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

.idea/modules.xml

Lines changed: 0 additions & 8 deletions
This file was deleted.

.idea/vcs.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.
Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
Inheritance:-
2-
3-
is, has
4-
is is used in inheritance
5-
6-
Class Calc //Parent class , Super, Base
7-
{
8-
add()
9-
sub()
10-
multi()
11-
div()
12-
}
13-
14-
Class AdvCalc //Child class, Sub, Derived
15-
{
16-
{
17-
}
1+
Inheritance:-
2+
3+
is, has
4+
is is used in inheritance
5+
6+
Class Calc //Parent class , Super, Base
7+
{
8+
add()
9+
sub()
10+
multi()
11+
div()
12+
}
13+
14+
Class AdvCalc //Child class, Sub, Derived
15+
{
16+
{
17+
}
1818
}
Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
1-
class Calc
2-
{
3-
public int add(int n1, int n2)
4-
{
5-
return n1+n2;
6-
}
7-
public int sub(int n1, int n2)
8-
{
9-
return n1-n2;
10-
}
11-
}
12-
13-
14-
public class AdvCalc extends Calc
15-
{
16-
public int multi(int n1, int n2)
17-
{
18-
return n1*n2;
19-
}
20-
public int div(int n1, int n2)
21-
{
22-
return n1/n2;
23-
}
24-
}
25-
26-
27-
public class Demo
28-
{
29-
public static void main(String a[])
30-
{
31-
// Calc obj=new Calc();
32-
AdvCalc obj=new AdvCalc();
33-
int r1=obj.add(4, 5);
34-
int r2=obj.sub(7,3);
35-
int r3=obj.multi(5,3);
36-
int r4=obj.div(15,4);
37-
38-
System.out.println(r1+" "+r2);
39-
40-
}
41-
}
42-
43-
1+
class Calc
2+
{
3+
public int add(int n1, int n2)
4+
{
5+
return n1+n2;
6+
}
7+
public int sub(int n1, int n2)
8+
{
9+
return n1-n2;
10+
}
11+
}
12+
13+
14+
public class AdvCalc extends Calc
15+
{
16+
public int multi(int n1, int n2)
17+
{
18+
return n1*n2;
19+
}
20+
public int div(int n1, int n2)
21+
{
22+
return n1/n2;
23+
}
24+
}
25+
26+
27+
public class Demo
28+
{
29+
public static void main(String a[])
30+
{
31+
// Calc obj=new Calc();
32+
AdvCalc obj=new AdvCalc();
33+
int r1=obj.add(4, 5);
34+
int r2=obj.sub(7,3);
35+
int r3=obj.multi(5,3);
36+
int r4=obj.div(15,4);
37+
38+
System.out.println(r1+" "+r2);
39+
40+
}
41+
}
42+
43+
Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,53 @@
1-
class Calc
2-
{
3-
public int add(int n1, int n2)
4-
{
5-
return n1+n2;
6-
}
7-
public int sub(int n1, int n2)
8-
{
9-
return n1-n2;
10-
}
11-
}
12-
13-
14-
class AdvCalc extends Calc
15-
{
16-
public int multi(int n1, int n2)
17-
{
18-
return n1*n2;
19-
}
20-
public int div(int n1, int n2)
21-
{
22-
return n1/n2;
23-
}
24-
}
25-
26-
//class VeryAdvCalc extends Calc
27-
class VeryAdvCalc extends AdvCalc
28-
{
29-
public double power(int n1,int n2)
30-
{
31-
return Math.pow(n1, n2);
32-
}
33-
}
34-
35-
public class Demo
36-
{
37-
public static void main(String a[])
38-
{
39-
// Calc obj=new Calc();
40-
// AdvCalc obj=new AdvCalc();
41-
VeryAdvCalc obj=new VeryAdvCalc();
42-
43-
int r1=obj.add(4, 5);
44-
int r2=obj.sub(7,3);
45-
int r3=obj.multi(5,3);
46-
int r4=obj.div(15,4);
47-
double r5=obj.power(4,2);
48-
49-
System.out.println(r1+" "+r2+" "+r3+" "+r4+" "+r5);
50-
51-
}
52-
}
53-
1+
class Calc
2+
{
3+
public int add(int n1, int n2)
4+
{
5+
return n1+n2;
6+
}
7+
public int sub(int n1, int n2)
8+
{
9+
return n1-n2;
10+
}
11+
}
12+
13+
14+
class AdvCalc extends Calc
15+
{
16+
public int multi(int n1, int n2)
17+
{
18+
return n1*n2;
19+
}
20+
public int div(int n1, int n2)
21+
{
22+
return n1/n2;
23+
}
24+
}
25+
26+
//class VeryAdvCalc extends Calc
27+
class VeryAdvCalc extends AdvCalc
28+
{
29+
public double power(int n1,int n2)
30+
{
31+
return Math.pow(n1, n2);
32+
}
33+
}
34+
35+
public class Demo
36+
{
37+
public static void main(String a[])
38+
{
39+
// Calc obj=new Calc();
40+
// AdvCalc obj=new AdvCalc();
41+
VeryAdvCalc obj=new VeryAdvCalc();
42+
43+
int r1=obj.add(4, 5);
44+
int r2=obj.sub(7,3);
45+
int r3=obj.multi(5,3);
46+
int r4=obj.div(15,4);
47+
double r5=obj.power(4,2);
48+
49+
System.out.println(r1+" "+r2+" "+r3+" "+r4+" "+r5);
50+
51+
}
52+
}
53+
Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
class A{
2-
3-
}
4-
class B extends A{
5-
6-
}
7-
//class C extends A,B
8-
// Multiple inheritance does not supported by Java
9-
// Ambiguity issue
10-
class C extends B{
11-
12-
}
13-
14-
public class Demo{
15-
public static void main(String args[])
16-
{
17-
18-
}
1+
class A{
2+
3+
}
4+
class B extends A{
5+
6+
}
7+
//class C extends A,B
8+
// Multiple inheritance does not supported by Java
9+
// Ambiguity issue
10+
class C extends B{
11+
12+
}
13+
14+
public class Demo{
15+
public static void main(String args[])
16+
{
17+
18+
}
1919
}

0 commit comments

Comments
 (0)