Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
devops-workshop
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
Container registry
Model registry
Operate
Environments
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
Sigurd Almåsbakk Skogmo
devops-workshop
Commits
0969e5ee
Commit
0969e5ee
authored
5 years ago
by
Sigurd Almåsbakk Skogmo
Browse files
Options
Downloads
Patches
Plain Diff
;
parent
2c844508
No related branches found
No related tags found
No related merge requests found
Pipeline
#71944
passed
5 years ago
Stage: test
Stage: deploy
Changes
1
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/java/resources/CalculatorResource.java
+1
-1
1 addition, 1 deletion
src/main/java/resources/CalculatorResource.java
with
1 addition
and
1 deletion
src/main/java/resources/CalculatorResource.java
+
1
−
1
View file @
0969e5ee
...
@@ -41,7 +41,7 @@ public class CalculatorResource {
...
@@ -41,7 +41,7 @@ public class CalculatorResource {
else
if
(
expressionTrimmed
.
matches
(
"^\\d+(?:\\s*[-]\\s*\\d+)*$"
))
result
=
subtraction
(
expressionTrimmed
);
else
if
(
expressionTrimmed
.
matches
(
"^\\d+(?:\\s*[-]\\s*\\d+)*$"
))
result
=
subtraction
(
expressionTrimmed
);
else
if
(
expressionTrimmed
.
matches
(
"^\\d+(?:\\s*[*]\\s*\\d+)*$"
))
result
=
multiplication
(
expressionTrimmed
);
else
if
(
expressionTrimmed
.
matches
(
"^\\d+(?:\\s*[*]\\s*\\d+)*$"
))
result
=
multiplication
(
expressionTrimmed
);
else
if
(
expressionTrimmed
.
matches
(
"^\\d+(?:\\s*[/]\\s*\\d+)*$"
))
result
=
division
(
expressionTrimmed
);
else
if
(
expressionTrimmed
.
matches
(
"^\\d+(?:\\s*[/]\\s*\\d+)*$"
))
result
=
division
(
expressionTrimmed
);
else
return
"Ugyldig inndata"
else
return
"Ugyldig inndata"
;
return
String
.
valueOf
(
result
);
return
String
.
valueOf
(
result
);
}
}
...
...
This diff is collapsed.
Click to expand it.
Sigurd Almåsbakk Skogmo
@sigurask
mentioned in commit
7103df43
·
5 years ago
mentioned in commit
7103df43
mentioned in commit 7103df43aef12a6b6185be2eea46271ee17f6321
Toggle commit list
Sigurd Almåsbakk Skogmo
@sigurask
mentioned in merge request
!2 (merged)
·
5 years ago
mentioned in merge request
!2 (merged)
mentioned in merge request !2
Toggle commit list
Sigurd Almåsbakk Skogmo
@sigurask
mentioned in commit
6323da0d
·
5 years ago
mentioned in commit
6323da0d
mentioned in commit 6323da0ded7bde89e95cda01fc9e892e387fed35
Toggle commit list
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