Skip to content

Commit eb1d5a0

Browse files
ProgrammingKiddoProgrammingKiddo
committed
Poms arreglados
1 parent 5844294 commit eb1d5a0

File tree

3 files changed

+106
-17
lines changed

3 files changed

+106
-17
lines changed

‎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

‎terminalCli/pom.xml‎

Lines changed: 45 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,51 @@
2222
<build>
2323
<plugins>
2424
<plugin>
25-
<!-- Build an executable JAR -->
26-
<groupId>org.apache.maven.plugins</groupId>
27-
<artifactId>maven-jar-plugin</artifactId>
28-
<version>3.2.0</version>
29-
<configuration>
30-
<archive>
31-
<manifest>
32-
<addClasspath>true</addClasspath>
33-
<classpathPrefix>lib/</classpathPrefix>
34-
<mainClass>terminalcli.Terminal</mainClass>
35-
</manifest>
36-
</archive>
37-
</configuration>
38-
</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>
3970
</plugins>
4071
</build>
4172

‎terminalCli/src/main/java/terminalcli/Screen.java‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import java.util.InputMismatchException;
99
import java.util.List;
1010
import java.util.Map;
11+
import java.util.NoSuchElementException;
1112
import java.util.Scanner;
1213

1314
import coreapi.Cafeteria;
@@ -216,7 +217,7 @@ public void productScreen(String type)
216217
{
217218
if (p.getType().equals(type))
218219
{
219-
System.out.println(counter + ". " + p.getName() + " (" + p.getPrice() + " euros)");
220+
System.out.println(counter + ". " + p.getName() + " (" + p.getPrice().doubleValue() + " euros)");
220221
counter++;
221222
}
222223
}
@@ -226,11 +227,14 @@ public void productScreen(String type)
226227
}
227228
System.out.println("R. Volver a pantalla anterior");
228229
System.out.println("---------------------------------------------");
229-
System.out.println("Introduzca una opcion");
230-
option = keyboard.nextLine();
230+
System.out.print("Introduzca una opcion: ");
231+
232+
option = keyboard.nextLine();
233+
231234

232235
if (!option.equalsIgnoreCase("R"))
233236
{
237+
System.out.print("Introduzca una cantidad: ");
234238
// Get the product and the quantity to add
235239
try {
236240
chosenProduct = Integer.parseInt(option);
@@ -257,6 +261,7 @@ public void productScreen(String type)
257261
// Add the amount of product to the order
258262
if (correctChoice == true)
259263
{
264+
System.out.println("\nProcessing the product...");
260265
try {
261266
ordSer.addProductToOrder(activeCoffee, activeOrder, availableProducts.get(chosenProduct-1), productQuantity);
262267
} catch (InsufficientStockException ex)

0 commit comments

Comments
 (0)