Skip to content
This repository was archived by the owner on Aug 18, 2020. It is now read-only.

Commit 067384b

Browse files
committed
Removed Errorhandling and removed some useless lines
1 parent e5bbc81 commit 067384b

File tree

6 files changed

+23
-47
lines changed

6 files changed

+23
-47
lines changed

src/main/scala/org/codeoverflow/chatoverflow/requirement/parameter/BooleanParameterImpl.scala

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@ class BooleanParameterImpl extends BooleanParameter {
1717

1818
override def get(): Boolean = value
1919

20-
override def deserialize(value: String): Unit = {
21-
set(Boolean.parseBoolean(value))
22-
}
20+
override def deserialize(value: String): Unit = set(Boolean.parseBoolean(value))
2321

2422
override def set(value: Boolean): Unit = this.value = value
2523

src/main/scala/org/codeoverflow/chatoverflow/requirement/parameter/ColorParameterImpl.scala

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,34 +18,30 @@ class ColorParameterImpl extends ColorParameter {
1818
override def get(): Color = value
1919

2020
override def deserialize(value: String): Unit = {
21-
2221
val hex3 = "^#([a-fA-F0-9]{6})$".r // Test if the value contains # and then 6 hexadecimal numbers
2322
val hex4 = "^#([a-fA-F0-9]{8})$".r // Test if the value contains # and then 8 hexadecimal numbers
2423
val int3 = "^(\\d+),(\\d+),(\\d+)$".r //Test if the value contains 3 ints
2524
val int4 = "^(\\d+),(\\d+),(\\d+),(\\d+)$".r //Test if the value contains 4 ints
2625
val float3 = "^(\\d+(?:\\.\\d+)?),(\\d+(?:\\.\\d+)?),(\\d+(?:\\.\\d+)?)$".r //Test if the value contains 3 floats
2726
val float4 = "^(\\d+(?:\\.\\d+)?),(\\d+(?:\\.\\d+)?),(\\d+(?:\\.\\d+)?),(\\d+(?:\\.\\d+)?)$".r //Test if the value contains 4 floats
2827

29-
try {
30-
value match {
31-
case hex3(hex) => {
32-
set(new Color(Integer.valueOf(hex.substring(0, 2), 16),
33-
Integer.valueOf(hex.substring(2, 4), 16),
34-
Integer.valueOf(hex.substring(4, 6), 16)))
35-
}
36-
case hex4(hex) =>
37-
set(new Color(Integer.valueOf(hex.substring(0, 2), 16),
38-
Integer.valueOf(hex.substring(2, 4), 16),
39-
Integer.valueOf(hex.substring(4, 6), 16),
40-
Integer.valueOf(hex.substring(6, 8), 16)))
41-
case int3(r, g, b) => set(new Color(r.toInt, g.toInt, b.toInt))
42-
case int4(r, g, b, a) => set(new Color(r.toInt, g.toInt, b.toInt, a.toInt))
43-
case float3(r, g, b) => set(new Color(r.toFloat, g.toFloat, b.toFloat))
44-
case float4(r, g, b, a) => set(new Color(r.toFloat, g.toFloat, b.toFloat, a.toFloat))
28+
value match {
29+
case hex3(hex) => {
30+
set(new Color(Integer.valueOf(hex.substring(0, 2), 16),
31+
Integer.valueOf(hex.substring(2, 4), 16),
32+
Integer.valueOf(hex.substring(4, 6), 16)))
4533
}
46-
} catch {
47-
case _: Exception => print("Can't convert String to color")
34+
case hex4(hex) =>
35+
set(new Color(Integer.valueOf(hex.substring(0, 2), 16),
36+
Integer.valueOf(hex.substring(2, 4), 16),
37+
Integer.valueOf(hex.substring(4, 6), 16),
38+
Integer.valueOf(hex.substring(6, 8), 16)))
39+
case int3(r, g, b) => set(new Color(r.toInt, g.toInt, b.toInt))
40+
case int4(r, g, b, a) => set(new Color(r.toInt, g.toInt, b.toInt, a.toInt))
41+
case float3(r, g, b) => set(new Color(r.toFloat, g.toFloat, b.toFloat))
42+
case float4(r, g, b, a) => set(new Color(r.toFloat, g.toFloat, b.toFloat, a.toFloat))
4843
}
44+
4945
}
5046

5147
override def set(value: Color): Unit = this.value = value

src/main/scala/org/codeoverflow/chatoverflow/requirement/parameter/DoubleParameterImpl.scala

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,7 @@ class DoubleParameterImpl extends DoubleParameter {
1818

1919
override def get(): Double = value
2020

21-
override def deserialize(value: String): Unit = {
22-
try {
23-
set(Double.valueOf(value))
24-
} catch {
25-
case _: Exception => print("Can't convert String to double")
26-
}
27-
}
21+
override def deserialize(value: String): Unit = set(Double.valueOf(value))
2822

2923
override def set(value: Double): Unit = this.value = value
3024
}

src/main/scala/org/codeoverflow/chatoverflow/requirement/parameter/IntegerParameterImpl.scala

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,7 @@ class IntegerParameterImpl extends IntegerParameter {
1616

1717
override def get(): Integer = value
1818

19-
override def deserialize(value: String): Unit = {
20-
try {
21-
set(Integer.valueOf(value))
22-
} catch {
23-
case _: Exception => print("Can't convert String to int")
24-
}
25-
}
19+
override def deserialize(value: String): Unit = set(Integer.valueOf(value))
2620

2721
override def set(value: Integer): Unit = this.value = value
2822

src/main/scala/org/codeoverflow/chatoverflow/requirement/parameter/ListParameterImpl.scala

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,11 @@ class ListParameterImpl extends ListParameter {
1313

1414
override def getType: Class[java.util.List[String]] = classOf[java.util.List[String]]
1515

16-
override def serialize(): String = {
17-
value.mkString(",")
18-
}
16+
override def serialize(): String = value.mkString(",")
1917

2018
override def get(): java.util.List[String] = value.asJava
2119

22-
override def deserialize(value: String): Unit = {
23-
set(value.split(",").toSeq.asJava)
24-
}
20+
override def deserialize(value: String): Unit = set(value.split(",").toSeq.asJava)
2521

2622
override def set(value: java.util.List[String]): Unit = this.value = value.asScala.toList
2723
}

src/main/scala/org/codeoverflow/chatoverflow/requirement/parameter/MapParameterImpl.scala

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,16 @@ class MapParameterImpl extends MapParameter {
1414

1515
override def getType: Class[java.util.Map[String, String]] = classOf[java.util.Map[String, String]]
1616

17-
override def serialize(): String = {
18-
value.map({ case (key, value) => s"($key;$value)" }).mkString(",")
19-
}
17+
override def serialize(): String = value.map({ case (key, value) => s"($key;$value)" }).mkString(",")
2018

2119
override def get(): java.util.Map[String, String] = value.asJava
2220

2321
override def deserialize(value: String): Unit = {
2422
val kvpair = "\\((.+);(.+)\\)".r
2523
val konly = "\\((.+);\\)".r
26-
set(value.split(",")
24+
this.value = value.split(",")
2725
.map({ case kvpair(k, v) => (k -> v); case konly(k) => (k -> ""); case _ => ("" -> "") })
28-
.toMap.asJava)
26+
.toMap
2927
}
3028

3129
override def set(value: java.util.Map[String, String]): Unit = this.value = value.asScala.toMap

0 commit comments

Comments
 (0)