Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
I
idatt1002_2023_9
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container 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
Andreas Kluge Svendsrud
idatt1002_2023_9
Commits
981200ef
Commit
981200ef
authored
1 year ago
by
Harry Linrui Xu
Browse files
Options
Downloads
Patches
Plain Diff
Removed duplicate get methods in Overview, as a result from merging conflict
parent
9507a68f
No related branches found
Branches containing commit
No related tags found
Tags containing commit
3 merge requests
!43
Merging frontend-testing into master
,
!38
"Made progressbar dynamic in accordance to spending. Added balance field....
,
!37
Made the sub progress bars respond to changes in expense
Pipeline
#215910
passed
1 year ago
Stage: build
Stage: test
Stage: package
Changes
1
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/java/no/ntnu/idatt1002/demo/data/Economics/Overview.java
+0
-25
0 additions, 25 deletions
.../java/no/ntnu/idatt1002/demo/data/Economics/Overview.java
with
0 additions
and
25 deletions
src/main/java/no/ntnu/idatt1002/demo/data/Economics/Overview.java
+
0
−
25
View file @
981200ef
...
...
@@ -42,31 +42,6 @@ public class Overview {
this
.
expenseRegister
=
expenseRegister
;
this
.
budget
=
budget
;
updateBalance
();
this
.
budget
=
budget
;
}
/**
* Get the IncomeRegister of the Overview.
* @return IncomeRegister
*/
public
IncomeRegister
getIncomeRegister
()
{
return
incomeRegister
;
}
/**
* Get the ExpenseRegister of the Overview.
* @return ExpenseRegister
*/
public
ExpenseRegister
getExpenseRegister
()
{
return
expenseRegister
;
}
/**
* Get the GeneralBudget of the Overview.
* @return GeneralBudget
*/
public
GeneralBudget
getBudget
()
{
return
budget
;
}
/**
...
...
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