Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
TProg
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Santiago Martin Vaiga Cousillas
TProg
Commits
8316c0e8
Commit
8316c0e8
authored
2 years ago
by
Tobias Iroa Otero
Browse files
Options
Downloads
Plain Diff
Merge branch 'main' of
https://gitlab.fing.edu.uy/santiago.vaiga/TProg.git
into main
parents
343a8487
39ae14f8
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/logica/Proveedor.java
+4
-0
4 additions, 0 deletions
src/logica/Proveedor.java
src/logica/Turista.java
+7
-3
7 additions, 3 deletions
src/logica/Turista.java
with
11 additions
and
3 deletions
src/logica/Proveedor.java
+
4
−
0
View file @
8316c0e8
...
...
@@ -41,5 +41,9 @@ public class Proveedor extends Usuario {
hayLink
=
h
;
}
public
void
agregarActividad
(
Actividad
act
){
String
nomAct
=
act
.
getNombre
();
actividades
.
put
(
nomAct
,
act
);
}
}
This diff is collapsed.
Click to expand it.
src/logica/Turista.java
+
7
−
3
View file @
8316c0e8
package
logica
;
import
java.util.*
;
public
class
Turista
extends
Usuario
{
public
class
Turista
extends
Usuario
{
private
String
nacionalidad
;
private
Set
<
CompraGeneral
>
comprasG
;
//
private Set<CompraGeneral> comprasG;
public
Turista
(
String
nick
,
String
nom
,
String
ap
,
String
mail
,
Date
nacimiento
,
String
nacionalidad
)
{
super
(
nick
,
nom
,
ap
,
mail
,
nacimiento
);
this
.
nacionalidad
=
nacionalidad
;
this
.
comprasG
=
new
HashSet
<
CompraGeneral
>();
//
this.comprasG = new HashSet<CompraGeneral>();
}
public
String
getNacionalidad
()
{
...
...
@@ -20,5 +20,9 @@ public class Turista extends Usuario {
nacionalidad
=
n
;
}
/*public void agregarCompraG(CompraGeneral cg){
comprasG.put(cg);
}
*/
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment