From f835f7364c2a0b6a0bdaa4e9e30c54bd8e71fd06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrick=20Ha=C3=9Fel?= <git@patrick-hassel.de>
Date: Tue, 4 Feb 2025 08:28:46 +0100
Subject: [PATCH] wire package refactor

---
 .../app/editor/circuit/circuit.component.less    | 16 ++--------------
 .../src/app/editor/circuit/circuit.component.ts  |  2 +-
 .../src/app/editor/part-wire/wire.component.less |  5 -----
 .../editor/parts/battery/battery.component.ts    |  2 +-
 .../src/app/editor/parts/part.component.less     |  2 +-
 .../app/editor/parts/relay/relay.component.ts    |  2 +-
 .../app/editor/parts/switch/switch.component.ts  |  2 +-
 .../src/app/editor/wire/wire.component.less      | 13 +++++++++++++
 .../{part-wire => wire}/wire.component.svg       |  0
 .../editor/{part-wire => wire}/wire.component.ts |  2 +-
 10 files changed, 21 insertions(+), 25 deletions(-)
 delete mode 100644 src/main/angular/src/app/editor/part-wire/wire.component.less
 create mode 100644 src/main/angular/src/app/editor/wire/wire.component.less
 rename src/main/angular/src/app/editor/{part-wire => wire}/wire.component.svg (100%)
 rename src/main/angular/src/app/editor/{part-wire => wire}/wire.component.ts (98%)

diff --git a/src/main/angular/src/app/editor/circuit/circuit.component.less b/src/main/angular/src/app/editor/circuit/circuit.component.less
index d9249a2..ea0f600 100644
--- a/src/main/angular/src/app/editor/circuit/circuit.component.less
+++ b/src/main/angular/src/app/editor/circuit/circuit.component.less
@@ -1,22 +1,10 @@
+@import "../wire/wire.component.less";
+
 .circuit {
   width: 100%;
   height: 100%;
 }
 
-.wireBack {
-  stroke-linecap: round;
-  stroke-width: 11px;
-  stroke: black;
-  pointer-events: none;
-}
-
-.wire {
-  stroke-width: 9px;
-  stroke-dasharray: 0 20;
-  stroke-linecap: round;
-  pointer-events: none;
-}
-
 .wireOpen {
   stroke: blue;
   stroke-dasharray: 5px 15px;
diff --git a/src/main/angular/src/app/editor/circuit/circuit.component.ts b/src/main/angular/src/app/editor/circuit/circuit.component.ts
index 13984fb..82071ec 100644
--- a/src/main/angular/src/app/editor/circuit/circuit.component.ts
+++ b/src/main/angular/src/app/editor/circuit/circuit.component.ts
@@ -6,7 +6,7 @@ import {Parts} from './Parts';
 import {PartComponent} from '../parts/part.component';
 
 import {Circuit} from './Circuit';
-import {WireComponent} from '../part-wire/wire.component';
+import {WireComponent} from '../wire/wire.component';
 
 @Component({
   selector: 'app-circuit',
diff --git a/src/main/angular/src/app/editor/part-wire/wire.component.less b/src/main/angular/src/app/editor/part-wire/wire.component.less
deleted file mode 100644
index f0949d5..0000000
--- a/src/main/angular/src/app/editor/part-wire/wire.component.less
+++ /dev/null
@@ -1,5 +0,0 @@
-@import "../parts/part.component.less";
-
-.partWireBack {
-  stroke-width: 5px;
-}
diff --git a/src/main/angular/src/app/editor/parts/battery/battery.component.ts b/src/main/angular/src/app/editor/parts/battery/battery.component.ts
index c241936..6ef8bad 100644
--- a/src/main/angular/src/app/editor/parts/battery/battery.component.ts
+++ b/src/main/angular/src/app/editor/parts/battery/battery.component.ts
@@ -1,6 +1,6 @@
 import {Component, Input} from '@angular/core';
 import {Battery} from './Battery';
-import {WireComponent} from '../../part-wire/wire.component';
+import {WireComponent} from '../../wire/wire.component';
 
 @Component({
   selector: 'g[inner-part-battery]',
diff --git a/src/main/angular/src/app/editor/parts/part.component.less b/src/main/angular/src/app/editor/parts/part.component.less
index e2f1467..121e513 100644
--- a/src/main/angular/src/app/editor/parts/part.component.less
+++ b/src/main/angular/src/app/editor/parts/part.component.less
@@ -1,4 +1,4 @@
-@import "../circuit/circuit.component.less";
+@import "../wire/wire.component.less";
 
 .part {
   border-radius: 0.51em;
diff --git a/src/main/angular/src/app/editor/parts/relay/relay.component.ts b/src/main/angular/src/app/editor/parts/relay/relay.component.ts
index 6da21e0..e1182bf 100644
--- a/src/main/angular/src/app/editor/parts/relay/relay.component.ts
+++ b/src/main/angular/src/app/editor/parts/relay/relay.component.ts
@@ -1,7 +1,7 @@
 import {Component, Input} from '@angular/core';
 import {Relay} from './Relay';
 import {NgIf} from '@angular/common';
-import {WireComponent} from '../../part-wire/wire.component';
+import {WireComponent} from '../../wire/wire.component';
 
 @Component({
   selector: 'g[inner-part-relay]',
diff --git a/src/main/angular/src/app/editor/parts/switch/switch.component.ts b/src/main/angular/src/app/editor/parts/switch/switch.component.ts
index 50e65a2..58255bf 100644
--- a/src/main/angular/src/app/editor/parts/switch/switch.component.ts
+++ b/src/main/angular/src/app/editor/parts/switch/switch.component.ts
@@ -1,6 +1,6 @@
 import {Component, Input} from '@angular/core';
 import {Switch} from './Switch';
-import {WireComponent} from '../../part-wire/wire.component';
+import {WireComponent} from '../../wire/wire.component';
 
 @Component({
   selector: 'g[inner-part-switch]',
diff --git a/src/main/angular/src/app/editor/wire/wire.component.less b/src/main/angular/src/app/editor/wire/wire.component.less
new file mode 100644
index 0000000..2105f58
--- /dev/null
+++ b/src/main/angular/src/app/editor/wire/wire.component.less
@@ -0,0 +1,13 @@
+.wireBack {
+  stroke-linecap: round;
+  stroke-width: 11px;
+  stroke: black;
+  pointer-events: none;
+}
+
+.wire {
+  stroke-width: 9px;
+  stroke-dasharray: 0 20;
+  stroke-linecap: round;
+  pointer-events: none;
+}
diff --git a/src/main/angular/src/app/editor/part-wire/wire.component.svg b/src/main/angular/src/app/editor/wire/wire.component.svg
similarity index 100%
rename from src/main/angular/src/app/editor/part-wire/wire.component.svg
rename to src/main/angular/src/app/editor/wire/wire.component.svg
diff --git a/src/main/angular/src/app/editor/part-wire/wire.component.ts b/src/main/angular/src/app/editor/wire/wire.component.ts
similarity index 98%
rename from src/main/angular/src/app/editor/part-wire/wire.component.ts
rename to src/main/angular/src/app/editor/wire/wire.component.ts
index 2d7862e..6f10675 100644
--- a/src/main/angular/src/app/editor/part-wire/wire.component.ts
+++ b/src/main/angular/src/app/editor/wire/wire.component.ts
@@ -1,5 +1,5 @@
 import {Component, Input} from '@angular/core';
-import {ANIMATION_ELECTRON_STEPS, Wire} from '../wire/Wire';
+import {ANIMATION_ELECTRON_STEPS, Wire} from './Wire';
 import {Junction} from '../junction/Junction';
 import {fadeColor} from '../colorHelpers';
 import {NgIf} from '@angular/common';