From 7f89830f753ece46fadd09806a0c92f2e42a2752 Mon Sep 17 00:00:00 2001 From: Matt345Fire Date: Tue, 21 Feb 2023 18:42:19 +0100 Subject: [PATCH] Fix: Pin I/O label numbering Merge commit ed8b3e0 from pull request Logisim-Ita#37 Matt345Fire/Logisim-Locale Update Analyze.java --- .../src/main/java/com/cburch/logisim/circuit/Analyze.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Logisim-Fork/src/main/java/com/cburch/logisim/circuit/Analyze.java b/Logisim-Fork/src/main/java/com/cburch/logisim/circuit/Analyze.java index fe8b999e..1a59769e 100644 --- a/Logisim-Fork/src/main/java/com/cburch/logisim/circuit/Analyze.java +++ b/Logisim-Fork/src/main/java/com/cburch/logisim/circuit/Analyze.java @@ -298,6 +298,7 @@ public int compare(Instance ac, Instance bc) { * throw new AnalyzeException.Conflict(); } } expressionMap.put(p2, e); } } } } */ + // Metodo che controlla il nome delle etichette (specialmente per l'analizza circuito) private static String toValidLabel(String label) { if (label == null) return null; @@ -331,9 +332,12 @@ private static String toValidLabel(String label) { } } if (end != null && ret.length() > 0) - ret.append(end.toString()); - if (ret.length() == 0) + ret.append(end); + if (ret.length() == 0 && end != null) { + return end.toString(); + } else if(ret.length() == 0) { return null; + } return ret.toString(); }