Skip to content

Commit 5b26ed8

Browse files
mariavazquezssmariavazquezss
committed
2 parents f3d7485 + ddf0fbe commit 5b26ed8

File tree

21 files changed

+566
-662
lines changed

21 files changed

+566
-662
lines changed

‎api/src/main/java/data/CardData.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88

99

1010
public interface CardData {
11-
public User getCard(int nCard);
11+
public Card getCard(int nCard);
1212
public void saveCard(Card c);
1313
}

‎api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
coreapi\ProductNotContainedInOrderException.class
21
data\UserData.class
32
coreapi\Product.class
4-
data\CafeteriaData.class
5-
coreapi\InsufficientStockException.class
63
coreapi\Cafeteria.class
74
data\OrderData.class
8-
coreapi\Order.class
9-
coreapi\InvalidQuantityException.class
10-
coreapi\ProductImpl.class
115
coreapi\InvalidDateException.class
126
data\ProductData.class
13-
coreapi\User.class
14-
coreapi\OrderStatus.class
157
coreapi\OrderFactory.class
16-
coreapi\OrderImpl.class
178
coreapi\Card.class
18-
coreapi\UnreachableStatusException.class
199
coreapi\Menu.class
2010
coreapi\OrderService.class
2111
data\CardData.class
12+
coreapi\ProductNotContainedInOrderException.class
13+
data\CafeteriaData.class
14+
coreapi\InsufficientStockException.class
15+
coreapi\Order.class
16+
coreapi\InvalidQuantityException.class
17+
coreapi\ProductImpl.class
18+
coreapi\User.class
19+
coreapi\OrderStatus.class
20+
coreapi\OrderImpl.class
21+
coreapi\UnreachableStatusException.class
2222
coreapi\WrongTransactionException.class

‎api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,24 @@
1-
C:\Users\Ichig\Documents\Repositories\dss2020-2021-CRUCA\api\src\main\java\coreapi\ProductCatalog.java
1+
C:\Users\Ichig\Documents\Repositories\dss2020-2021-CRUCA\api\src\main\java\coreapi\User.java
2+
C:\Users\Ichig\Documents\Repositories\dss2020-2021-CRUCA\api\src\main\java\data\ProductData.java
23
C:\Users\Ichig\Documents\Repositories\dss2020-2021-CRUCA\api\src\main\java\coreapi\Order.java
4+
C:\Users\Ichig\Documents\Repositories\dss2020-2021-CRUCA\api\src\main\java\data\CafeteriaData.java
35
C:\Users\Ichig\Documents\Repositories\dss2020-2021-CRUCA\api\src\main\java\coreapi\Cafeteria.java
46
C:\Users\Ichig\Documents\Repositories\dss2020-2021-CRUCA\api\src\main\java\coreapi\Menu.java
57
C:\Users\Ichig\Documents\Repositories\dss2020-2021-CRUCA\api\src\main\java\coreapi\ProductImpl.java
68
C:\Users\Ichig\Documents\Repositories\dss2020-2021-CRUCA\api\src\main\java\coreapi\Product.java
79
C:\Users\Ichig\Documents\Repositories\dss2020-2021-CRUCA\api\src\main\java\coreapi\ProductNotContainedInOrderException.java
810
C:\Users\Ichig\Documents\Repositories\dss2020-2021-CRUCA\api\src\main\java\coreapi\UnreachableStatusException.java
911
C:\Users\Ichig\Documents\Repositories\dss2020-2021-CRUCA\api\src\main\java\coreapi\OrderImpl.java
12+
C:\Users\Ichig\Documents\Repositories\dss2020-2021-CRUCA\api\src\main\java\data\package-info.java
13+
C:\Users\Ichig\Documents\Repositories\dss2020-2021-CRUCA\api\src\main\java\data\UserData.java
1014
C:\Users\Ichig\Documents\Repositories\dss2020-2021-CRUCA\api\src\main\java\coreapi\OrderStatus.java
15+
C:\Users\Ichig\Documents\Repositories\dss2020-2021-CRUCA\api\src\main\java\data\CardData.java
16+
C:\Users\Ichig\Documents\Repositories\dss2020-2021-CRUCA\api\src\main\java\coreapi\InvalidDateException.java
1117
C:\Users\Ichig\Documents\Repositories\dss2020-2021-CRUCA\api\src\main\java\coreapi\OrderService.java
1218
C:\Users\Ichig\Documents\Repositories\dss2020-2021-CRUCA\api\src\main\java\coreapi\OrderFactory.java
19+
C:\Users\Ichig\Documents\Repositories\dss2020-2021-CRUCA\api\src\main\java\coreapi\WrongTransactionException.java
20+
C:\Users\Ichig\Documents\Repositories\dss2020-2021-CRUCA\api\src\main\java\coreapi\Card.java
1321
C:\Users\Ichig\Documents\Repositories\dss2020-2021-CRUCA\api\src\main\java\coreapi\InsufficientStockException.java
22+
C:\Users\Ichig\Documents\Repositories\dss2020-2021-CRUCA\api\src\main\java\coreapi\InvalidQuantityException.java
23+
C:\Users\Ichig\Documents\Repositories\dss2020-2021-CRUCA\api\src\main\java\data\OrderData.java
1424
C:\Users\Ichig\Documents\Repositories\dss2020-2021-CRUCA\api\src\main\java\coreapi\package-info.java

‎apihttp/pom.xml‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@
2323
<version>0.0.1-SNAPSHOT</version>
2424
</dependency>
2525

26+
<dependency>
27+
<groupId>es.uca.dss.cruca</groupId>
28+
<artifactId>terminalcli</artifactId>
29+
<version>0.0.1-SNAPSHOT</version>
30+
</dependency>
31+
2632
<dependency>
2733
<groupId>org.springframework.boot</groupId>
2834
<artifactId>spring-boot-starter-web</artifactId>
@@ -47,6 +53,53 @@
4753
<groupId>org.springframework.boot</groupId>
4854
<artifactId>spring-boot-maven-plugin</artifactId>
4955
</plugin>
56+
57+
<plugin>
58+
<groupId>org.apache.maven.plugins</groupId>
59+
<artifactId>maven-jar-plugin</artifactId>
60+
<version>3.2.0</version>
61+
<configuration>
62+
<archive>
63+
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
64+
<manifest>
65+
<mainClass>apihttp.ApihttpApplication</mainClass>
66+
</manifest>
67+
</archive>
68+
</configuration>
69+
</plugin>
70+
<plugin>
71+
<groupId>org.apache.maven.plugins</groupId>
72+
<artifactId>maven-jar-plugin</artifactId>
73+
<version>2.4</version>
74+
<configuration>
75+
<archive>
76+
<manifest>
77+
<addClasspath>true</addClasspath>
78+
<mainClass>apihttp.ApihttpApplication</mainClass>
79+
<classpathPrefix>dependency-jars/</classpathPrefix>
80+
</manifest>
81+
</archive>
82+
</configuration>
83+
</plugin>
84+
<plugin>
85+
<groupId>org.apache.maven.plugins</groupId>
86+
<artifactId>maven-dependency-plugin</artifactId>
87+
<version>2.5.1</version>
88+
<executions>
89+
<execution>
90+
<id>copy-dependencies</id>
91+
<phase>package</phase>
92+
<goals>
93+
<goal>copy-dependencies</goal>
94+
</goals>
95+
<configuration>
96+
<outputDirectory>
97+
${project.build.directory}/dependency-jars/
98+
</outputDirectory>
99+
</configuration>
100+
</execution>
101+
</executions>
102+
</plugin>
50103
</plugins>
51104
</build>
52105

‎hito2.png‎

126 KB
Loading

‎terminalCli/pom.xml‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,69 @@
55
<version>0.0.1-SNAPSHOT</version>
66
<name>CRUCA Terminal Client</name>
77

8+
<properties>
9+
<maven.compiler.source>11</maven.compiler.source>
10+
<maven.compiler.target>11</maven.compiler.target>
11+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
12+
</properties>
13+
814
<dependencies>
915
<dependency>
1016
<groupId>es.uca.dss.cruca</groupId>
1117
<artifactId>projectcruca</artifactId>
1218
<version>0.0.1-SNAPSHOT</version>
1319
</dependency>
1420
</dependencies>
21+
22+
<build>
23+
<plugins>
24+
<plugin>
25+
<groupId>org.apache.maven.plugins</groupId>
26+
<artifactId>maven-jar-plugin</artifactId>
27+
<version>3.2.0</version>
28+
<configuration>
29+
<archive>
30+
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
31+
<manifest>
32+
<mainClass>terminalcli.Terminal</mainClass>
33+
</manifest>
34+
</archive>
35+
</configuration>
36+
</plugin>
37+
<plugin>
38+
<groupId>org.apache.maven.plugins</groupId>
39+
<artifactId>maven-jar-plugin</artifactId>
40+
<version>2.4</version>
41+
<configuration>
42+
<archive>
43+
<manifest>
44+
<addClasspath>true</addClasspath>
45+
<mainClass>terminalcli.Terminal</mainClass>
46+
<classpathPrefix>dependency-jars/</classpathPrefix>
47+
</manifest>
48+
</archive>
49+
</configuration>
50+
</plugin>
51+
<plugin>
52+
<groupId>org.apache.maven.plugins</groupId>
53+
<artifactId>maven-dependency-plugin</artifactId>
54+
<version>2.5.1</version>
55+
<executions>
56+
<execution>
57+
<id>copy-dependencies</id>
58+
<phase>package</phase>
59+
<goals>
60+
<goal>copy-dependencies</goal>
61+
</goals>
62+
<configuration>
63+
<outputDirectory>
64+
${project.build.directory}/dependency-jars/
65+
</outputDirectory>
66+
</configuration>
67+
</execution>
68+
</executions>
69+
</plugin>
70+
</plugins>
71+
</build>
72+
1573
</project>

‎terminalCli/src/main/java/commands/AddProduct.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ public AddProduct(Product prod)
1919
this.prod = prod;
2020
}
2121

22-
public void execute()
22+
public void execute(Screen context)
2323
{
2424
try {
25-
Screen.ordSer.addProductToOrder(Screen.activeCafeteria, Screen.activeOrder, prod, 1);
25+
context.ordSer.addProductToOrder(context.activeCoffee, context.activeOrder, prod, 1);
2626
} catch (InsufficientStockException ex)
2727
{
2828
System.err.println(ex.toString());

‎terminalCli/src/main/java/commands/Command.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
package commands;
22

3+
import terminalcli.Screen;
4+
35
/**
46
* @author Borja_FM
57
*/
68

79

810
public interface Command {
911

10-
public void execute();
12+
public void execute(Screen context);
1113
}

‎terminalCli/src/main/java/commands/RemoveProduct.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ public RemoveProduct(Product prod)
2020
this.prod = prod;
2121
}
2222

23-
public void execute()
23+
public void execute(Screen context)
2424
{
2525
try {
26-
Screen.ordSer.removeProductFromOrder(Screen.activeCafeteria, Screen.activeOrder, prod, 1);
26+
context.ordSer.removeProductFromOrder(context.activeCoffee, context.activeOrder, prod, 1);
2727
} catch (InsufficientStockException ex)
2828
{
2929
System.err.println(ex.toString());

‎terminalCli/src/main/java/commands/ShowCafeteriaProducts.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
public class ShowCafeteriaProducts implements Command {
1212

13-
public void execute()
13+
public void execute(Screen context)
1414
{
1515

1616
}

0 commit comments

Comments
 (0)