Commit 4a1e8ba
Remove java.awt dependency from non-GUI packages (#7)
* Replace java.awt.Point with custom Point class in non-GUI packages
* Fix GUI classes to use custom Point when interacting with domain model
* Add missing distance() method to custom Point class
The custom Point class was missing the distance() method that java.awt.Point provides, causing compilation errors in DefaultContext.kt that uses this method to calculate distances between points.
* Make Point class immutable and add comprehensive tests
- Changed Point class properties from var to val for immutability
- Added comprehensive test suite with 21 test cases covering:
- Constructor variations (default and parameterized)
- Immutability verification
- Clone and copy operations
- Equals and hashCode contracts
- Distance calculations (horizontal, vertical, diagonal)
- Edge cases (negative coordinates, large values)
- Data class features (component access, copy with modifications)
This improves code quality and test coverage for SonarQube.
* Fix immutable Point class compilation errors
Made Point class properties truly immutable by changing them from var to val. Fixed code that was trying to mutate Point objects:
1. DefaultContext.swapXY() - Now returns a new Point with swapped coordinates
2. DefaultContext.bresenham() - Uses local var copies (p1Mut, p2Mut) instead of mutating parameters
3. Cell.Segment.transform() - Creates new Point instead of cloning and mutating
These changes maintain the original algorithm logic while respecting immutability.
Added BresenhamJoinTest.kt with 9 test cases covering:
- Horizontal line generation (straight line along x-axis)
- Vertical line generation (straight line along y-axis)
- Diagonal line at 45 degrees
- Shallow slope lines (more x than y movement)
- Steep slope lines (more y than x movement)
- Short distance handling (≤ √2 skips Bresenham)
- Negative coordinate handling
- Bidirectional line generation (forward/reverse)
- Point immutability preservation during join operations
Tests verify the Bresenham algorithm through the public joinCells API,
ensuring correct intermediate cell placement when connecting distant cells.
Addresses request in comment 2672984094.
* Remove clone() method from immutable Point class
Since Point is now an immutable data class, cloning is unnecessary.
Updated all usages to use Point instances directly:
- DefaultContext: Removed clone() calls in bresenhamJoin
- PointTest: Removed clone() test
- Array2DMapTest: Simplified point creation
- BresenhamJoinTest: Fixed tests to avoid negative coordinates and grid boundaries
- RailwayNetGridCanvas: Minor formatting cleanup
---------
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: Bedřich Hovorka <bedrich.hovorka@gmail.com>
Co-authored-by: Claude Sonnet 4.5 <noreply@anthropic.com>1 parent be077d9 commit 4a1e8ba
23 files changed
Lines changed: 654 additions & 63 deletions
File tree
- src
- main/kotlin/cz/vutbr/fit/interlockSim
- context
- gui
- gridcanvas
- objects/cells
- sim
- util
- xml
- test/kotlin/cz/vutbr/fit/interlockSim
- context
- objects/cells
- testutil
- util
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
14 | | - | |
| 14 | + | |
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
15 | | - | |
| 15 | + | |
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
| |||
Lines changed: 23 additions & 23 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
31 | 31 | | |
32 | 32 | | |
33 | 33 | | |
| 34 | + | |
34 | 35 | | |
35 | 36 | | |
36 | 37 | | |
37 | 38 | | |
38 | 39 | | |
39 | 40 | | |
40 | 41 | | |
41 | | - | |
42 | 42 | | |
43 | 43 | | |
44 | 44 | | |
| |||
168 | 168 | | |
169 | 169 | | |
170 | 170 | | |
171 | | - | |
172 | | - | |
173 | | - | |
174 | | - | |
| 171 | + | |
| 172 | + | |
175 | 173 | | |
176 | 174 | | |
177 | 175 | | |
| |||
286 | 284 | | |
287 | 285 | | |
288 | 286 | | |
289 | | - | |
290 | | - | |
| 287 | + | |
| 288 | + | |
291 | 289 | | |
292 | 290 | | |
293 | 291 | | |
| |||
389 | 387 | | |
390 | 388 | | |
391 | 389 | | |
| 390 | + | |
| 391 | + | |
| 392 | + | |
| 393 | + | |
392 | 394 | | |
393 | | - | |
394 | | - | |
| 395 | + | |
| 396 | + | |
395 | 397 | | |
396 | 398 | | |
397 | 399 | | |
398 | | - | |
399 | | - | |
| 400 | + | |
| 401 | + | |
400 | 402 | | |
401 | 403 | | |
402 | 404 | | |
403 | | - | |
404 | | - | |
| 405 | + | |
| 406 | + | |
405 | 407 | | |
406 | 408 | | |
407 | 409 | | |
408 | 410 | | |
409 | 411 | | |
410 | | - | |
| 412 | + | |
411 | 413 | | |
412 | | - | |
413 | | - | |
414 | | - | |
415 | | - | |
416 | | - | |
417 | | - | |
| 414 | + | |
| 415 | + | |
| 416 | + | |
| 417 | + | |
418 | 418 | | |
419 | 419 | | |
420 | 420 | | |
421 | 421 | | |
422 | 422 | | |
423 | | - | |
| 423 | + | |
424 | 424 | | |
425 | | - | |
| 425 | + | |
426 | 426 | | |
427 | | - | |
| 427 | + | |
428 | 428 | | |
429 | 429 | | |
430 | 430 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
14 | | - | |
| 14 | + | |
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
14 | | - | |
| 14 | + | |
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
13 | | - | |
| 13 | + | |
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
| |||
Lines changed: 3 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
183 | 183 | | |
184 | 184 | | |
185 | 185 | | |
186 | | - | |
| 186 | + | |
187 | 187 | | |
188 | 188 | | |
189 | 189 | | |
| |||
316 | 316 | | |
317 | 317 | | |
318 | 318 | | |
319 | | - | |
| 319 | + | |
| 320 | + | |
320 | 321 | | |
321 | 322 | | |
322 | 323 | | |
| |||
Lines changed: 2 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
14 | | - | |
15 | 14 | | |
16 | 15 | | |
17 | 16 | | |
| |||
31 | 30 | | |
32 | 31 | | |
33 | 32 | | |
34 | | - | |
| 33 | + | |
35 | 34 | | |
36 | 35 | | |
37 | 36 | | |
| |||
44 | 43 | | |
45 | 44 | | |
46 | 45 | | |
47 | | - | |
| 46 | + | |
48 | 47 | | |
49 | 48 | | |
50 | 49 | | |
| |||
Lines changed: 3 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
17 | | - | |
18 | 17 | | |
19 | 18 | | |
20 | 19 | | |
| |||
54 | 53 | | |
55 | 54 | | |
56 | 55 | | |
57 | | - | |
| 56 | + | |
58 | 57 | | |
59 | 58 | | |
60 | 59 | | |
| |||
66 | 65 | | |
67 | 66 | | |
68 | 67 | | |
69 | | - | |
| 68 | + | |
70 | 69 | | |
71 | 70 | | |
72 | 71 | | |
| |||
86 | 85 | | |
87 | 86 | | |
88 | 87 | | |
89 | | - | |
| 88 | + | |
90 | 89 | | |
91 | 90 | | |
92 | 91 | | |
| |||
Lines changed: 2 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
12 | | - | |
| 12 | + | |
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
| |||
82 | 82 | | |
83 | 83 | | |
84 | 84 | | |
85 | | - | |
86 | | - | |
87 | | - | |
| 85 | + | |
88 | 86 | | |
89 | 87 | | |
90 | 88 | | |
| |||
0 commit comments