diff options
| -rw-r--r-- | java-advanced/xx-nested-classes/.gitignore (renamed from oop/01-account/.gitignore) | 0 | ||||
| -rw-r--r-- | java-advanced/xx-nested-classes/CreateInner.java (renamed from oop/10-nested-classes/CreateInner.java) | 0 | ||||
| -rw-r--r-- | java-advanced/xx-nested-classes/MyOuter.java (renamed from oop/10-nested-classes/MyOuter.java) | 0 | ||||
| -rw-r--r-- | oop/01-data-abstraction/.gitignore (renamed from oop/02-non-static-methods/.gitignore) | 0 | ||||
| -rw-r--r-- | oop/01-data-abstraction/Account.java (renamed from oop/01-account/Account.java) | 0 | ||||
| -rw-r--r-- | oop/01-data-abstraction/AccountTest.java (renamed from oop/01-account/AccountTest.java) | 0 | ||||
| -rw-r--r-- | oop/02-inheritance/.gitignore (renamed from oop/03-static-methods/.gitignore) | 0 | ||||
| -rw-r--r-- | oop/02-inheritance/Account.java (renamed from oop/07-inheritance/Account.java) | 0 | ||||
| -rw-r--r-- | oop/02-inheritance/AccountTest.java (renamed from oop/07-inheritance/AccountTest.java) | 0 | ||||
| -rw-r--r-- | oop/02-inheritance/CheckingAccount.java (renamed from oop/07-inheritance/CheckingAccount.java) | 0 | ||||
| -rw-r--r-- | oop/02-inheritance/SavingsAccount.java (renamed from oop/07-inheritance/SavingsAccount.java) | 0 | ||||
| -rw-r--r-- | oop/02-non-static-methods/Calculator.java | 15 | ||||
| -rw-r--r-- | oop/02-non-static-methods/MyApp.java | 13 | ||||
| -rw-r--r-- | oop/03-interfaces/.gitignore (renamed from oop/04-constructors/.gitignore) | 0 | ||||
| -rw-r--r-- | oop/03-interfaces/BasicCalculator.java (renamed from oop/11-interfaces/BasicCalculator.java) | 0 | ||||
| -rw-r--r-- | oop/03-interfaces/Calculator.java (renamed from oop/11-interfaces/Calculator.java) | 0 | ||||
| -rw-r--r-- | oop/03-interfaces/CalculatorTest.java (renamed from oop/11-interfaces/CalculatorTest.java) | 0 | ||||
| -rw-r--r-- | oop/04-encapsulation/.gitignore (renamed from oop/05-destructor/.gitignore) | 0 | ||||
| -rw-r--r-- | oop/04-encapsulation/Account.java (renamed from oop/06-encapsulation/Account.java) | 0 | ||||
| -rw-r--r-- | oop/04-encapsulation/AccountTest.java (renamed from oop/06-encapsulation/AccountTest.java) | 0 | ||||
| -rw-r--r-- | oop/05-polymorphism/.gitignore (renamed from oop/06-encapsulation/.gitignore) | 0 | ||||
| -rw-r--r-- | oop/05-polymorphism/Customer.java (renamed from oop/09-polymorphism/Customer.java) | 0 | ||||
| -rw-r--r-- | oop/05-polymorphism/CustomerApp.java (renamed from oop/09-polymorphism/CustomerApp.java) | 0 | ||||
| -rw-r--r-- | oop/05-polymorphism/CustomerDetailsFormatter.java (renamed from oop/09-polymorphism/CustomerDetailsFormatter.java) | 0 | ||||
| -rw-r--r-- | oop/05-polymorphism/PremiumCustomer.java (renamed from oop/09-polymorphism/PremiumCustomer.java) | 0 | ||||
| -rw-r--r-- | oop/06-static-properties/.gitignore (renamed from oop/07-inheritance/.gitignore) | 0 | ||||
| -rw-r--r-- | oop/06-static-properties/Calculator.java (renamed from oop/03-static-methods/Calculator.java) | 0 | ||||
| -rw-r--r-- | oop/06-static-properties/MyApp.java (renamed from oop/03-static-methods/MyApp.java) | 0 | ||||
| -rw-r--r-- | oop/07-constructors/.gitignore (renamed from oop/08-pass-by-value-reference/.gitignore) | 0 | ||||
| -rw-r--r-- | oop/07-constructors/Account.java (renamed from oop/04-constructors/Account.java) | 0 | ||||
| -rw-r--r-- | oop/07-constructors/AccountTest.java (renamed from oop/04-constructors/AccountTest.java) | 0 | ||||
| -rw-r--r-- | oop/08-destructor/.gitignore (renamed from oop/09-polymorphism/.gitignore) | 0 | ||||
| -rw-r--r-- | oop/08-destructor/Account.java (renamed from oop/05-destructor/Account.java) | 0 | ||||
| -rw-r--r-- | oop/08-destructor/AccountTest.java (renamed from oop/05-destructor/AccountTest.java) | 0 | ||||
| -rw-r--r-- | oop/09-pass-by-value-reference/.gitignore (renamed from oop/10-nested-classes/.gitignore) | 0 | ||||
| -rw-r--r-- | oop/09-pass-by-value-reference/Customer.java (renamed from oop/08-pass-by-value-reference/Customer.java) | 0 | ||||
| -rw-r--r-- | oop/09-pass-by-value-reference/PassByReference.java (renamed from oop/08-pass-by-value-reference/PassByReference.java) | 0 | ||||
| -rw-r--r-- | oop/09-pass-by-value-reference/PassByValue.java (renamed from oop/08-pass-by-value-reference/PassByValue.java) | 0 | ||||
| -rw-r--r-- | oop/11-interfaces/.gitignore | 1 |
39 files changed, 0 insertions, 29 deletions
diff --git a/oop/01-account/.gitignore b/java-advanced/xx-nested-classes/.gitignore index 6b468b6..6b468b6 100644 --- a/oop/01-account/.gitignore +++ b/java-advanced/xx-nested-classes/.gitignore diff --git a/oop/10-nested-classes/CreateInner.java b/java-advanced/xx-nested-classes/CreateInner.java index ab3830e..ab3830e 100644 --- a/oop/10-nested-classes/CreateInner.java +++ b/java-advanced/xx-nested-classes/CreateInner.java diff --git a/oop/10-nested-classes/MyOuter.java b/java-advanced/xx-nested-classes/MyOuter.java index 6821b98..6821b98 100644 --- a/oop/10-nested-classes/MyOuter.java +++ b/java-advanced/xx-nested-classes/MyOuter.java diff --git a/oop/02-non-static-methods/.gitignore b/oop/01-data-abstraction/.gitignore index 6b468b6..6b468b6 100644 --- a/oop/02-non-static-methods/.gitignore +++ b/oop/01-data-abstraction/.gitignore diff --git a/oop/01-account/Account.java b/oop/01-data-abstraction/Account.java index 03a9e9c..03a9e9c 100644 --- a/oop/01-account/Account.java +++ b/oop/01-data-abstraction/Account.java diff --git a/oop/01-account/AccountTest.java b/oop/01-data-abstraction/AccountTest.java index 0409d86..0409d86 100644 --- a/oop/01-account/AccountTest.java +++ b/oop/01-data-abstraction/AccountTest.java diff --git a/oop/03-static-methods/.gitignore b/oop/02-inheritance/.gitignore index 6b468b6..6b468b6 100644 --- a/oop/03-static-methods/.gitignore +++ b/oop/02-inheritance/.gitignore diff --git a/oop/07-inheritance/Account.java b/oop/02-inheritance/Account.java index 91acb95..91acb95 100644 --- a/oop/07-inheritance/Account.java +++ b/oop/02-inheritance/Account.java diff --git a/oop/07-inheritance/AccountTest.java b/oop/02-inheritance/AccountTest.java index cc5056b..cc5056b 100644 --- a/oop/07-inheritance/AccountTest.java +++ b/oop/02-inheritance/AccountTest.java diff --git a/oop/07-inheritance/CheckingAccount.java b/oop/02-inheritance/CheckingAccount.java index a7c19b8..a7c19b8 100644 --- a/oop/07-inheritance/CheckingAccount.java +++ b/oop/02-inheritance/CheckingAccount.java diff --git a/oop/07-inheritance/SavingsAccount.java b/oop/02-inheritance/SavingsAccount.java index 497fb3d..497fb3d 100644 --- a/oop/07-inheritance/SavingsAccount.java +++ b/oop/02-inheritance/SavingsAccount.java diff --git a/oop/02-non-static-methods/Calculator.java b/oop/02-non-static-methods/Calculator.java deleted file mode 100644 index ecc7234..0000000 --- a/oop/02-non-static-methods/Calculator.java +++ /dev/null @@ -1,15 +0,0 @@ - -public class Calculator { - - public int add(int a, int b) { - return a + b; - } - - public int subtract(int a, int b) { - return a - b; - } - - public double convertFromC2F(double cTemp) { - return cTemp*180/100 + 32.0; - } -} diff --git a/oop/02-non-static-methods/MyApp.java b/oop/02-non-static-methods/MyApp.java deleted file mode 100644 index 2ebdcae..0000000 --- a/oop/02-non-static-methods/MyApp.java +++ /dev/null @@ -1,13 +0,0 @@ - -public class MyApp { - - /** - * @param args - */ - public static void main(String[] args) { - Calculator cal = new Calculator(); - - System.out.println(cal.convertFromC2F(100.0)); - } - -} diff --git a/oop/04-constructors/.gitignore b/oop/03-interfaces/.gitignore index 6b468b6..6b468b6 100644 --- a/oop/04-constructors/.gitignore +++ b/oop/03-interfaces/.gitignore diff --git a/oop/11-interfaces/BasicCalculator.java b/oop/03-interfaces/BasicCalculator.java index f087d81..f087d81 100644 --- a/oop/11-interfaces/BasicCalculator.java +++ b/oop/03-interfaces/BasicCalculator.java diff --git a/oop/11-interfaces/Calculator.java b/oop/03-interfaces/Calculator.java index aa716b0..aa716b0 100644 --- a/oop/11-interfaces/Calculator.java +++ b/oop/03-interfaces/Calculator.java diff --git a/oop/11-interfaces/CalculatorTest.java b/oop/03-interfaces/CalculatorTest.java index e2340dd..e2340dd 100644 --- a/oop/11-interfaces/CalculatorTest.java +++ b/oop/03-interfaces/CalculatorTest.java diff --git a/oop/05-destructor/.gitignore b/oop/04-encapsulation/.gitignore index 6b468b6..6b468b6 100644 --- a/oop/05-destructor/.gitignore +++ b/oop/04-encapsulation/.gitignore diff --git a/oop/06-encapsulation/Account.java b/oop/04-encapsulation/Account.java index 55d99d0..55d99d0 100644 --- a/oop/06-encapsulation/Account.java +++ b/oop/04-encapsulation/Account.java diff --git a/oop/06-encapsulation/AccountTest.java b/oop/04-encapsulation/AccountTest.java index 9242cea..9242cea 100644 --- a/oop/06-encapsulation/AccountTest.java +++ b/oop/04-encapsulation/AccountTest.java diff --git a/oop/06-encapsulation/.gitignore b/oop/05-polymorphism/.gitignore index 6b468b6..6b468b6 100644 --- a/oop/06-encapsulation/.gitignore +++ b/oop/05-polymorphism/.gitignore diff --git a/oop/09-polymorphism/Customer.java b/oop/05-polymorphism/Customer.java index 56b0f7b..56b0f7b 100644 --- a/oop/09-polymorphism/Customer.java +++ b/oop/05-polymorphism/Customer.java diff --git a/oop/09-polymorphism/CustomerApp.java b/oop/05-polymorphism/CustomerApp.java index 79e1c31..79e1c31 100644 --- a/oop/09-polymorphism/CustomerApp.java +++ b/oop/05-polymorphism/CustomerApp.java diff --git a/oop/09-polymorphism/CustomerDetailsFormatter.java b/oop/05-polymorphism/CustomerDetailsFormatter.java index d2640e0..d2640e0 100644 --- a/oop/09-polymorphism/CustomerDetailsFormatter.java +++ b/oop/05-polymorphism/CustomerDetailsFormatter.java diff --git a/oop/09-polymorphism/PremiumCustomer.java b/oop/05-polymorphism/PremiumCustomer.java index a098af5..a098af5 100644 --- a/oop/09-polymorphism/PremiumCustomer.java +++ b/oop/05-polymorphism/PremiumCustomer.java diff --git a/oop/07-inheritance/.gitignore b/oop/06-static-properties/.gitignore index 6b468b6..6b468b6 100644 --- a/oop/07-inheritance/.gitignore +++ b/oop/06-static-properties/.gitignore diff --git a/oop/03-static-methods/Calculator.java b/oop/06-static-properties/Calculator.java index 7ec2851..7ec2851 100644 --- a/oop/03-static-methods/Calculator.java +++ b/oop/06-static-properties/Calculator.java diff --git a/oop/03-static-methods/MyApp.java b/oop/06-static-properties/MyApp.java index 0137433..0137433 100644 --- a/oop/03-static-methods/MyApp.java +++ b/oop/06-static-properties/MyApp.java diff --git a/oop/08-pass-by-value-reference/.gitignore b/oop/07-constructors/.gitignore index 6b468b6..6b468b6 100644 --- a/oop/08-pass-by-value-reference/.gitignore +++ b/oop/07-constructors/.gitignore diff --git a/oop/04-constructors/Account.java b/oop/07-constructors/Account.java index 82875be..82875be 100644 --- a/oop/04-constructors/Account.java +++ b/oop/07-constructors/Account.java diff --git a/oop/04-constructors/AccountTest.java b/oop/07-constructors/AccountTest.java index 9774e84..9774e84 100644 --- a/oop/04-constructors/AccountTest.java +++ b/oop/07-constructors/AccountTest.java diff --git a/oop/09-polymorphism/.gitignore b/oop/08-destructor/.gitignore index 6b468b6..6b468b6 100644 --- a/oop/09-polymorphism/.gitignore +++ b/oop/08-destructor/.gitignore diff --git a/oop/05-destructor/Account.java b/oop/08-destructor/Account.java index a5baab7..a5baab7 100644 --- a/oop/05-destructor/Account.java +++ b/oop/08-destructor/Account.java diff --git a/oop/05-destructor/AccountTest.java b/oop/08-destructor/AccountTest.java index 8c9f474..8c9f474 100644 --- a/oop/05-destructor/AccountTest.java +++ b/oop/08-destructor/AccountTest.java diff --git a/oop/10-nested-classes/.gitignore b/oop/09-pass-by-value-reference/.gitignore index 6b468b6..6b468b6 100644 --- a/oop/10-nested-classes/.gitignore +++ b/oop/09-pass-by-value-reference/.gitignore diff --git a/oop/08-pass-by-value-reference/Customer.java b/oop/09-pass-by-value-reference/Customer.java index d092a3d..d092a3d 100644 --- a/oop/08-pass-by-value-reference/Customer.java +++ b/oop/09-pass-by-value-reference/Customer.java diff --git a/oop/08-pass-by-value-reference/PassByReference.java b/oop/09-pass-by-value-reference/PassByReference.java index 8eb577a..8eb577a 100644 --- a/oop/08-pass-by-value-reference/PassByReference.java +++ b/oop/09-pass-by-value-reference/PassByReference.java diff --git a/oop/08-pass-by-value-reference/PassByValue.java b/oop/09-pass-by-value-reference/PassByValue.java index 2500d03..2500d03 100644 --- a/oop/08-pass-by-value-reference/PassByValue.java +++ b/oop/09-pass-by-value-reference/PassByValue.java diff --git a/oop/11-interfaces/.gitignore b/oop/11-interfaces/.gitignore deleted file mode 100644 index 6b468b6..0000000 --- a/oop/11-interfaces/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.class |