Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
DAE
/
Practica2
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
8a026ae1
authored
Oct 28, 2020
by
Álvaro Anguita
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
algunas mejoras
parent
a99fb517
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
13 deletions
UjaPack.iml
src/main/java/com/mycompany/ujapack/Envio.java
src/main/java/com/mycompany/ujapack/main.java
UjaPack.iml
View file @
8a026ae1
...
...
@@ -2,7 +2,11 @@
<module
org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule=
"true"
type=
"JAVA_MODULE"
version=
"4"
>
<component
name=
"FacetManager"
>
<facet
type=
"Spring"
name=
"Spring"
>
<configuration
/>
<configuration>
<fileset
id=
"fileset"
name=
"Spring Application Context"
removed=
"false"
>
<file>
file://$MODULE_DIR$/src/main/java/com/mycompany/ujapack/UjaPckImpl.java
</file>
</fileset>
</configuration>
</facet>
</component>
<component
name=
"NewModuleRootManager"
LANGUAGE_LEVEL=
"JDK_1_8"
>
...
...
src/main/java/com/mycompany/ujapack/Envio.java
View file @
8a026ae1
...
...
@@ -23,16 +23,16 @@ public class Envio {
}
private
int
idOficinaDestino
;
private
int
idOficinaOrigen
;
private
final
int
idOficinaDestino
;
private
final
int
idOficinaOrigen
;
private
int
localizador
;
private
String
destinatario
;
private
String
remitente
;
private
final
String
destinatario
;
private
final
String
remitente
;
private
float
peso
;
private
float
alto
;
private
float
ancho
;
private
float
largo
;
private
double
dimensiones
;
private
final
double
dimensiones
;
private
Estado
estado
;
private
LocalDateTime
fechaEntrega
;
private
double
importe
;
...
...
@@ -47,7 +47,7 @@ public class Envio {
this
.
localizador
=
localizador
;
this
.
destinatario
=
destinatario
;
this
.
remitente
=
remitente
;
this
.
estado
=
e
stado
.
enTransito
;
this
.
estado
=
E
stado
.
enTransito
;
this
.
fechaEntrega
=
fechaEntrega
;
this
.
idOficinaDestino
=
idOficinaDestino
;
this
.
idOficinaOrigen
=
idOficinaOrigen
;
...
...
src/main/java/com/mycompany/ujapack/main.java
View file @
8a026ae1
...
...
@@ -9,8 +9,6 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import
java.io.BufferedReader
;
import
java.io.FileReader
;
import
java.io.IOException
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.Map
;
import
java.util.Set
;
...
...
@@ -26,7 +24,7 @@ public class main {
BufferedReader
br
=
new
BufferedReader
(
fr
);
StringBuilder
strB
=
new
StringBuilder
();
String
srtAux
=
null
;
String
srtAux
;
while
((
srtAux
=
br
.
readLine
())!=
null
){
strB
.
append
(
srtAux
);
}
...
...
@@ -48,7 +46,6 @@ public class main {
for
(
JsonElement
provincia
:
prov
){
String
nom
=
provincia
.
getAsString
();
Oficina
o
=
new
Oficina
(
idOficina
,
provincia
.
getAsString
(),
id
);
c
.
oficinas
.
put
(
idOficina
,
o
);
...
...
@@ -60,7 +57,7 @@ public class main {
JsonArray
conexiones
=
centroJson
.
getAsJsonArray
(
"conexiones"
);
ArrayList
<
Integer
>
conexTemp
=
new
ArrayList
<>();
for
(
JsonElement
conexion
:
conexiones
){
c
.
conexiones
.
add
(
Integer
.
parseInt
(
conexion
.
getAsString
()));
...
...
@@ -75,7 +72,7 @@ public class main {
/**
* @param args the command line arguments
*/
public
static
void
main
(
String
[]
args
)
throws
IOException
{
public
static
void
main
(
String
[]
args
)
{
System
.
out
.
println
(
"prueba"
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment