Skip to content

Commit 5fff264

Browse files
committed
chunkListener get also format/application of received messages.
1 parent b3eb2f8 commit 5fff264

File tree

5 files changed

+25
-12
lines changed

5 files changed

+25
-12
lines changed

src/net/sharksystem/asap/ASAPChunkReceivedListener.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,11 @@
55
* @author thsc
66
*/
77
public interface ASAPChunkReceivedListener {
8-
void chunkReceived(String sender, String uri, int era);
8+
/**
9+
* @param format
10+
* @param sender
11+
* @param uri
12+
* @param era
13+
*/
14+
void chunkReceived(String format, String sender, String uri, int era);
915
}

src/net/sharksystem/asap/ASAPEngine.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ public void handleASAPAssimilate(ASAP_AssimilationPDU_1_0 asapAssimiliationPDU,
435435
System.out.println(b.toString());
436436
//>>>>>>>>>>>>>>>>>>>debug
437437

438-
listener.chunkReceived(sender, uri, eraSender);
438+
listener.chunkReceived(this.format, sender, uri, eraSender);
439439
} else {
440440
//<<<<<<<<<<<<<<<<<<debug
441441
b = new StringBuilder();

src/net/sharksystem/asap/ASAPInMemoMessages.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package net.sharksystem.asap;
22

33
import net.sharksystem.asap.apps.ASAPMessages;
4+
import sun.reflect.generics.reflectiveObjects.NotImplementedException;
45

56
import java.io.IOException;
67
import java.util.ArrayList;
@@ -9,7 +10,6 @@
910
import java.util.NoSuchElementException;
1011

1112
/**
12-
*
1313
* @author thsc
1414
*/
1515
class ASAPInMemoMessages implements ASAPMessages {
@@ -101,7 +101,7 @@ public CharSequence getURI() {
101101

102102
@Override
103103
public CharSequence getFormat() {
104-
return null;
104+
throw new NotImplementedException();
105105
}
106106

107107
@Override

src/net/sharksystem/asap/management/ASAPManagementMessageHandler.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,9 @@ CharSequence getURI(Set<CharSequence> recipients) throws IOException, ASAPExcept
3636
return null;
3737
}
3838

39-
@Override
40-
public void chunkReceived(String sender, String uri, int era) {
39+
public void chunkReceived(String format, String sender, String uri, int era) {
4140
System.out.println(this.getLogStart()
42-
+ "handle received chunk (sender|uri|era) " + sender + "|" + uri + "|" + era);
41+
+ "handle received chunk (format|sender|uri|era) " + format + sender + "|" + uri + "|" + era);
4342
try {
4443
ASAPEngine asapManagementEngine = multiASAPEngine.getEngineByFormat(ASAP_1_0.ASAP_MANAGEMENT_FORMAT);
4544

src/net/sharksystem/asap/util/ASAPChunkReceivedTester.java

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,24 @@ public class ASAPChunkReceivedTester implements ASAPChunkReceivedListener {
1010
private String sender = null;
1111
private String uri = null;
1212
private int era;
13+
private String format;
1314

1415
@Override
15-
public void chunkReceived(String sender, String uri, int era) {
16-
System.out.println("ChunkReceiverTester.chunkReceived called: (sender/uri/era) " +
16+
public void chunkReceived(String format, String sender, String uri, int era) {
17+
System.out.println("ChunkReceiverTester.chunkReceived called: (format|sender|uri|era) " +
18+
format +
19+
" | " +
1720
sender +
18-
" / " +
21+
" | " +
1922
uri +
20-
" / " +
23+
" | " +
2124
era);
25+
this.format = format;
2226
this.sender = sender;
2327
this.uri = uri;
2428
this.era = era;
2529
}
26-
30+
2731
public boolean chunkReceived() {
2832
return this.sender != null;
2933
}
@@ -32,6 +36,10 @@ public String getSender() {
3236
return this.sender;
3337
}
3438

39+
public String getFormat() {
40+
return this.format;
41+
}
42+
3543
public String getUri() {
3644
return this.uri;
3745
}

0 commit comments

Comments
 (0)