2021-07-14T22:37

kenta-shimizu · Jul 14, 2021 · b3d0938 · b3d0938
1 parent ea073a2
commit b3d0938
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 14 deletions.
diff --git a/docs/CliSecsSimulator.jar b/docs/CliSecsSimulator.jar
diff --git a/docs/SwingSecsSimulator.jar b/docs/SwingSecsSimulator.jar
diff --git a/src/main/java/com/shimizukenta/secssimulator/AbstractSecsSimulator.java b/src/main/java/com/shimizukenta/secssimulator/AbstractSecsSimulator.java
@@ -495,11 +495,12 @@ private void receivePrimaryMsg(SecsMessage primaryMsg) throws InterruptedExcepti
 		{
 			/*** Auto-reply ***/
 
-			final SmlMessage reply = autoReply(primaryMsg).orElse(null);
+			final List<SmlMessage> replys = autoReplys(primaryMsg);
+
+			if ( replys.size() == 1 ) {
 
-			if ( reply != null ) {
 				try {
-					send(primaryMsg, reply);
+					send(primaryMsg, replys.get(0));
 				}
 				catch (SecsSimulatorException ignore) {
 				}
@@ -554,7 +555,7 @@ private void receivePrimaryMsg(SecsMessage primaryMsg) throws InterruptedExcepti
 		}
 	}
 
-	private Optional<SmlMessage> autoReply(SecsMessage primary) {
+	private List<SmlMessage> autoReplys(SecsMessage primary) {
 
 		if (
 				primary.wbit()
@@ -571,11 +572,11 @@ private Optional<SmlMessage> autoReply(SecsMessage primary) {
 					) {
 
 				return config.smlAliasPairPool()
-						.optionalOnlyOneStreamFunction(strm, func + 1);
+						.getReplyMessages(strm, func + 1);
 			}
 		}
 
-		return Optional.empty();
+		return Collections.emptyList();
 	}
 
 	private Optional<LocalSecsMessage> autoReplySxF0(SecsMessage primary) {
@@ -598,7 +599,7 @@ private Optional<LocalSecsMessage> autoReplySxF0(SecsMessage primary) {
 
 		if ( primary.wbit() ) {
 
-			if ( ! config.smlAliasPairPool().hasReplyMessages(strm, func) ) {
+			if ( ! config.smlAliasPairPool().hasReplyMessages(strm, func + 1) ) {
 
 				if ( config.smlAliasPairPool().hasReplyMessages(strm) ) {
 
@@ -638,7 +639,7 @@ private Optional<LocalSecsMessage> autoReplyS9F3or5(SecsMessage primary) {
 
 			if ( strm >= 0 ) {
 
-				if ( ! config.smlAliasPairPool().hasReplyMessages(strm, func) ) {
+				if ( ! config.smlAliasPairPool().hasReplyMessages(strm, func + 1) ) {
 
 					if ( config.smlAliasPairPool().hasReplyMessages(strm) ) {
 

diff --git a/src/main/java/com/shimizukenta/secssimulator/SmlAliasPairPool.java b/src/main/java/com/shimizukenta/secssimulator/SmlAliasPairPool.java
@@ -156,19 +156,30 @@ public Optional<SmlMessage> optionalAlias(CharSequence alias) {
 	 */
 	public Optional<SmlMessage> optionalOnlyOneStreamFunction(int strm, int func) {
 
-		Collection<SmlMessage> smls = pairs.stream()
-				.map(p -> p.sml())
-				.filter(sm -> sm.getStream() == strm)
-				.filter(sm -> sm.getFunction() == func)
-				.collect(Collectors.toList());
+		final List<SmlMessage> smls = getReplyMessages(strm, func);
 
 		if ( smls.size() == 1 ) {
-			return smls.stream().findAny();
+			return Optional.of(smls.get(0));
 		}
 
 		return Optional.empty();
 	}
 
+	/**
+	 * Returns SmlMessages of same Stream and Funcion Number.
+	 * 
+	 * @param strm of SmlMessage stream-number
+	 * @param func of SmlMessage function-number
+	 * @return SmlMessages of same Stream and Funcion Number
+	 */
+	public List<SmlMessage> getReplyMessages(int strm, int func) {
+		return pairs.stream()
+				.map(p -> p.sml())
+				.filter(sm -> sm.getStream() == strm)
+				.filter(sm -> sm.getFunction() == func)
+				.collect(Collectors.toList());
+	}
+
 	/**
 	 * Returns true if has reply-messsages.
 	 *