From 009cbcf987118b44e08f0f3689b719d1fa2cf59c Mon Sep 17 00:00:00 2001
From: hneemann <helmut.neemann@arcor.de>
Date: Sat, 4 Mar 2017 10:24:26 +0100
Subject: [PATCH] better PinMap error messages

---
 src/main/java/de/neemann/digital/builder/PinMap.java | 10 ++++++++--
 src/main/resources/lang/lang_de.xml                  |  6 ++++--
 src/main/resources/lang/lang_en.xml                  |  6 ++++--
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/main/java/de/neemann/digital/builder/PinMap.java b/src/main/java/de/neemann/digital/builder/PinMap.java
index 0e79b7f14..4848407ec 100644
--- a/src/main/java/de/neemann/digital/builder/PinMap.java
+++ b/src/main/java/de/neemann/digital/builder/PinMap.java
@@ -232,9 +232,15 @@ public class PinMap {
         if (p == null)
             p = searchFirstFreePin(direction, in);
         if (p == null) {
-            throw new PinMapException(Lang.get("err_pinMap_toMannyPinsDefinedInDir_N0", direction));
+            if (direction.equals(PinDescription.Direction.input))
+                throw new PinMapException(Lang.get("err_pinMap_toMannyInputsDefined"));
+            else
+                throw new PinMapException(Lang.get("err_pinMap_toMannyOutputsDefined"));
         } else if (!isAvailable(direction, p)) {
-            throw new PinMapException(Lang.get("err_pinMap_pin_N0_notAllowedInDir_N1", p, direction));
+            if (direction.equals(PinDescription.Direction.input))
+                throw new PinMapException(Lang.get("err_pinMap_pin_N0_isNotAnInput", p));
+            else
+                throw new PinMapException(Lang.get("err_pinMap_pin_N0_isNotAnOutput", p));
         }
         return p;
     }
diff --git a/src/main/resources/lang/lang_de.xml b/src/main/resources/lang/lang_de.xml
index 02e0f057c..a428e14a7 100644
--- a/src/main/resources/lang/lang_de.xml
+++ b/src/main/resources/lang/lang_de.xml
@@ -386,9 +386,11 @@ Die gesammte Speichergröße beträgt damit damit dx*dy*2 Speicherworte.</string
     <string name="err_output_N_notDefined">Ausgang {0} ist nicht definiert</string>
     <string name="err_pinMap_NoNameForPin_N">Kein Name für Pin {0}</string>
     <string name="err_pinMap_Pin_N_AssignedTwicePin">Pin {0} doppelt belegt!</string>
-    <string name="err_pinMap_pin_N0_notAllowedInDir_N1">Pin {0} ist nicht erlaubt als {1}!</string>
+    <string name="err_pinMap_pin_N0_isNotAnInput">Pin {0} ist kein Eingang!</string>
+    <string name="err_pinMap_pin_N0_isNotAnOutput">Pin {0} ist kein Ausgang!</string>
     <string name="err_pinMap_noEqualsfound">Kein &quot;=&quot; gefunden!</string>
-    <string name="err_pinMap_toMannyPinsDefinedInDir_N0">Zu viele Pins definiert als: {0}</string>
+    <string name="err_pinMap_toMannyInputsDefined">Zu viele Eingänge verwendet!</string>
+    <string name="err_pinMap_toMannyOutputsDefined">Zu viele Ausgänge verwendet!</string>
     <string name="err_pinNotPresent">Pin nicht vorhanden</string>
     <string name="err_pinWithoutName">Es gibt einen Pin ohne einen Namen.</string>
     <string name="err_pin_N0_atElement_N1_notFound">Pin {0} von Element {1} wurde nicht gefunden</string>
diff --git a/src/main/resources/lang/lang_en.xml b/src/main/resources/lang/lang_en.xml
index 7a52153ec..77bb467d6 100644
--- a/src/main/resources/lang/lang_en.xml
+++ b/src/main/resources/lang/lang_en.xml
@@ -373,8 +373,10 @@
     <string name="err_pinMap_NoNameForPin_N">No Name for pin {0}</string>
     <string name="err_pinMap_Pin_N_AssignedTwicePin">Pin {0} assigned twice!</string>
     <string name="err_pinMap_noEqualsfound">No = found!</string>
-    <string name="err_pinMap_pin_N0_notAllowedInDir_N1">Pin {0} is not allowed as {1}!</string>
-    <string name="err_pinMap_toMannyPinsDefinedInDir_N0">To manny pins defined in direction: {0}!</string>
+    <string name="err_pinMap_pin_N0_isNotAnInput">Pin {0} is not an input!</string>
+    <string name="err_pinMap_pin_N0_isNotAnOutput">Pin {0} is not an output!</string>
+    <string name="err_pinMap_toMannyInputsDefined">To many inputs used!</string>
+    <string name="err_pinMap_toMannyOutputsDefined">To many outputs used!</string>
     <string name="err_pinNotPresent">Pin not present</string>
     <string name="err_pinWithoutName">Found a pin without a name.</string>
     <string name="err_pin_N0_atElement_N1_notFound">Pin {0} not found at component {1}</string>