From d392591a012a2209e87b566565ecc308a8e1335d Mon Sep 17 00:00:00 2001 From: "j.m.wagenaar" Date: Sat, 1 Sep 2018 22:59:28 +0200 Subject: [PATCH] Renamed M3Dweller class to SpindleOnDweller (incl. test files) --- .../{M3Dweller.java => SpindleOnDweller.java} | 4 +- .../gcode/util/CommandProcessorLoader.java | 24 +- .../resources/MessagesBundle_af_ZA.properties | 2 +- .../resources/MessagesBundle_de_DE.properties | 238 +++---- .../resources/MessagesBundle_el_EL.properties | 300 ++++---- .../resources/MessagesBundle_en_US.properties | 2 +- .../resources/MessagesBundle_es_ES.properties | 284 ++++---- .../resources/MessagesBundle_fr_FR.properties | 316 ++++----- .../resources/MessagesBundle_it_IT.properties | 60 +- .../resources/MessagesBundle_jp_JA.properties | 392 +++++------ .../resources/MessagesBundle_lt_LT.properties | 416 +++++------ .../resources/MessagesBundle_nb_NO.properties | 28 +- .../resources/MessagesBundle_nl_NL.properties | 2 +- .../resources/MessagesBundle_pl_PL.properties | 40 +- .../resources/MessagesBundle_pt_BR.properties | 382 +++++------ .../resources/MessagesBundle_ru_RU.properties | 592 ++++++++-------- .../resources/MessagesBundle_sv_SE.properties | 496 +++++++------- .../resources/MessagesBundle_tr_TR.properties | 542 +++++++-------- .../resources/MessagesBundle_zh_CN.properties | 648 +++++++++--------- .../src/resources/firmware_config/grbl.json | 4 +- .../firmware_config/smoothieboard.json | 4 +- .../src/resources/firmware_config/test_1.json | 4 +- .../src/resources/firmware_config/test_2.json | 4 +- .../src/resources/firmware_config/tinyg.json | 4 +- ...lerTest.java => SpindleOnDwellerTest.java} | 8 +- .../util/CommandProcessorLoaderTest.java | 4 +- 26 files changed, 2400 insertions(+), 2400 deletions(-) rename ugs-core/src/com/willwinder/universalgcodesender/gcode/processors/{M3Dweller.java => SpindleOnDweller.java} (94%) rename ugs-core/test/com/willwinder/universalgcodesender/gcode/processors/{M3DwellerTest.java => SpindleOnDwellerTest.java} (91%) diff --git a/ugs-core/src/com/willwinder/universalgcodesender/gcode/processors/M3Dweller.java b/ugs-core/src/com/willwinder/universalgcodesender/gcode/processors/SpindleOnDweller.java similarity index 94% rename from ugs-core/src/com/willwinder/universalgcodesender/gcode/processors/M3Dweller.java rename to ugs-core/src/com/willwinder/universalgcodesender/gcode/processors/SpindleOnDweller.java index 1554acd990..fdf3803bb1 100644 --- a/ugs-core/src/com/willwinder/universalgcodesender/gcode/processors/M3Dweller.java +++ b/ugs-core/src/com/willwinder/universalgcodesender/gcode/processors/SpindleOnDweller.java @@ -33,13 +33,13 @@ This file is part of Universal Gcode Sender (UGS). * * @author wwinder */ -public class M3Dweller implements CommandProcessor { +public class SpindleOnDweller implements CommandProcessor { private final String dwellCommand; // Contains an M3 not followed by another digit (i.e. M30) private Pattern spindleOnPattern = Pattern.compile(".*[mM][34](?!\\d)(\\D.*)?"); - public M3Dweller(double dwellDuration) { + public SpindleOnDweller(double dwellDuration) { this.dwellCommand = String.format(Locale.ROOT, "G4P%.2f", dwellDuration); } diff --git a/ugs-core/src/com/willwinder/universalgcodesender/gcode/util/CommandProcessorLoader.java b/ugs-core/src/com/willwinder/universalgcodesender/gcode/util/CommandProcessorLoader.java index fab32a4b54..8e2daf8082 100644 --- a/ugs-core/src/com/willwinder/universalgcodesender/gcode/util/CommandProcessorLoader.java +++ b/ugs-core/src/com/willwinder/universalgcodesender/gcode/util/CommandProcessorLoader.java @@ -28,7 +28,7 @@ This file is part of Universal Gcode Sender (UGS). import com.willwinder.universalgcodesender.gcode.processors.DecimalProcessor; import com.willwinder.universalgcodesender.gcode.processors.FeedOverrideProcessor; import com.willwinder.universalgcodesender.gcode.processors.M30Processor; -import com.willwinder.universalgcodesender.gcode.processors.M3Dweller; +import com.willwinder.universalgcodesender.gcode.processors.SpindleOnDweller; import com.willwinder.universalgcodesender.gcode.processors.PatternRemover; import com.willwinder.universalgcodesender.gcode.processors.WhitespaceProcessor; import com.willwinder.universalgcodesender.i18n.Localization; @@ -82,10 +82,10 @@ public class CommandProcessorLoader { * name: "WhitespaceProcessor", * "enabled": , * "optional": , - * "args": {} - * },{ - * name: "M3Dweller", - * "enabled": , + "args": {} + },{ + name: "SpindleOnDweller", + "enabled": , * "optional": , * "args": {} * } @@ -166,9 +166,9 @@ static private List getConfigFrom(String jsonConfig) { * name: "WhitespaceProcessor", * "enabled": * "optional": , - * },{ - * name: "M3Dweller", - * "enabled": , + },{ + name: "SpindleOnDweller", + "enabled": , * "optional": , * "args": { * "duraion": @@ -220,9 +220,9 @@ static public List initializeWithProcessors(List Jede Box kann eine Reihe oder G-Code-Befehlen getrennt durch ';' enthalten.
Um den Befehl auszuführen, klicken Sie auf die Schaltfläche links neben dem Text.

Interaktive Ersetzungen können vorgenommen werden. mit\: