Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

vasemägi paul esimene punkt #21

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
37 changes: 37 additions & 0 deletions kartulisalat/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>paul</groupId>
<artifactId>paul</artifactId>
<packaging>jar</packaging>
<version>1</version>

<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.2.RELEASE</version>
</parent>

<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
23 changes: 23 additions & 0 deletions kartulisalat/src/main/java/paul/Rakendus.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
public class Rakendus{

public static void main(String[] arg){

Toiduaine t1=new Toiduaine("Kartul", 3, 8, 11);
Toidukomponendid t2=new Toidukomponendid();
t2.kogus=100;
t2.t=t1;
System.out.println("Kartulis on rasva: "+t2.rasvakogus()+"g");

Toiduaine t3=new Toiduaine("Vorst", 10, 14, 5);
Toidukomponendid t4=new Toidukomponendid();
t4.kogus=50;
t4.t=t3;
System.out.println("Vorstis on rasva: "+t4.rasvakogus()+"g");


}

}

// Kartulis on rasva: 8.0g
// Vorstis on rasva: 7.0g
22 changes: 22 additions & 0 deletions kartulisalat/src/main/java/paul/Toiduaine.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
public class Toiduaine{

String nimetus;
double valgud;
double rasvad;
double sysivesikud;

public Toiduaine(String nimetus,
double valgud,
double rasvad,
double sysivesikud){

if(valgud+rasvad+sysivesikud>100){
throw new RuntimeException("Viga, üle 100%");
}
this.nimetus=nimetus;
this.valgud=valgud;
this.rasvad=rasvad;
this.sysivesikud=sysivesikud;
}

}
11 changes: 11 additions & 0 deletions kartulisalat/src/main/java/paul/Toidukomponendid.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
public class Toidukomponendid{

Toiduaine t;

double kogus;
double rasvakogus(){
if(t==null){return kogus;}
return (kogus*t.rasvad)/100;
}

}
Binary file added kartulisalat/target/classes/Rakendus.class
Binary file not shown.
Binary file added kartulisalat/target/classes/Toiduaine.class
Binary file not shown.
Binary file added kartulisalat/target/classes/Toiduained.class
Binary file not shown.
Binary file added kartulisalat/target/classes/Toidukomponendid.class
Binary file not shown.
5 changes: 5 additions & 0 deletions kartulisalat/target/maven-archiver/pom.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#Generated by Apache Maven
#Wed Apr 26 16:08:05 EEST 2017
version=1
groupId=paul
artifactId=paul
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Rakendus.class
Toidukomponendid.class
Toiduaine.class
Toiduained.class
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
C:\Users\Pablo\Desktop\kartulisalat\src\main\java\paul\Toiduaine.java
C:\Users\Pablo\Desktop\kartulisalat\src\main\java\paul\Toiduained.java
C:\Users\Pablo\Desktop\kartulisalat\src\main\java\paul\Rakendus.java
C:\Users\Pablo\Desktop\kartulisalat\src\main\java\paul\Toidukomponendid.java
Binary file added kartulisalat/target/paul-1.jar
Binary file not shown.
Binary file added kartulisalat/target/paul-1.jar.original
Binary file not shown.