Skip to content

Commit 6e42aaf

Browse files
Matt345FireLucaCaruso-dev
authored andcommitted
Fix: Pin I/O label numbering
Merge commit ed8b3e0 from pull request Logisim-Ita#37 Matt345Fire/Logisim-Locale Update Analyze.java
1 parent ec57830 commit 6e42aaf

File tree

1 file changed

+5
-2
lines changed
  • Logisim-Fork/src/main/java/com/cburch/logisim/circuit

1 file changed

+5
-2
lines changed

Logisim-Fork/src/main/java/com/cburch/logisim/circuit/Analyze.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,7 @@ public int compare(Instance ac, Instance bc) {
298298
* throw new AnalyzeException.Conflict(); } } expressionMap.put(p2, e); } } } }
299299
*/
300300

301+
// Metodo che controlla il nome delle etichette (specialmente per l'analizza circuito)
301302
private static String toValidLabel(String label) {
302303
if (label == null)
303304
return null;
@@ -331,8 +332,10 @@ private static String toValidLabel(String label) {
331332
}
332333
}
333334
if (end != null && ret.length() > 0)
334-
ret.append(end.toString());
335-
if (ret.length() == 0)
335+
ret.append(end);
336+
if (ret.length() == 0 && end != null) {
337+
return end.toString();
338+
} else if(ret.length() == 0) {
336339
return null;
337340
return ret.toString();
338341
}

0 commit comments

Comments
 (0)