Skip to content

Commit bee5f1f

Browse files
thsc42thsc42
committed
Did some refactoring. This is no longer compatible with current ASAPAndroid release.
1 parent bc9a28e commit bee5f1f

File tree

111 files changed

+1213
-1112
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+1213
-1112
lines changed

‎src/net/sharksystem/Utils.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package net.sharksystem;
22

3-
import net.sharksystem.asap.ASAP;
3+
import net.sharksystem.asap.internals.ASAP;
44

55
import java.io.File;
66
import java.util.ArrayList;

src/net/sharksystem/asap/apps/ASAPEnvironmentChangesListener.java renamed to src/net/sharksystem/asap/ASAPEnvironmentChangesListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package net.sharksystem.asap.apps;
1+
package net.sharksystem.asap;
22

33
import java.util.Set;
44

src/net/sharksystem/asap/apps/ASAPEnvironmentChangesListenerManagement.java renamed to src/net/sharksystem/asap/ASAPEnvironmentChangesListenerManagement.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package net.sharksystem.asap.apps;
1+
package net.sharksystem.asap;
22

33
public interface ASAPEnvironmentChangesListenerManagement {
44
/**

‎src/net/sharksystem/asap/ASAPInternalPeerWrapper.java‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
package net.sharksystem.asap;
2+
3+
import net.sharksystem.asap.internals.ASAPException;
4+
import net.sharksystem.asap.internals.ASAPInternalOnlinePeersChangedListener;
5+
import net.sharksystem.asap.internals.ASAPInternalPeer;
6+
7+
import java.io.IOException;
8+
import java.io.InputStream;
9+
import java.io.OutputStream;
10+
11+
public abstract class ASAPInternalPeerWrapper extends ASAPListenerManagingPeer
12+
implements ASAPInternalOnlinePeersChangedListener {
13+
14+
private ASAPInternalPeer peer;
15+
16+
protected void setInternalPeer(ASAPInternalPeer peer) {
17+
this.peer = peer;
18+
this.peer.addOnlinePeersChangedListener(this);
19+
}
20+
21+
protected ASAPInternalPeer getInternalPeer() {
22+
return this.peer;
23+
}
24+
25+
public CharSequence getPeerName() {
26+
return this.peer.getOwner();
27+
}
28+
29+
public void handleConnection(InputStream is, OutputStream os) throws IOException, ASAPException {
30+
this.peer.handleConnection(is, os);
31+
}
32+
33+
@Override
34+
public void onlinePeersChanged(ASAPInternalPeer peer) {
35+
this.environmentChangesListenerManager.notifyListeners(peer.getOnlinePeers());
36+
}
37+
}

src/net/sharksystem/asap/apps/mock/ASAPBasicAbstractPeer.java renamed to src/net/sharksystem/asap/ASAPListenerManagingPeer.java

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,9 @@
1-
package net.sharksystem.asap.apps.mock;
1+
package net.sharksystem.asap;
22

3-
import net.sharksystem.asap.apps.ASAPEnvironmentChangesListener;
4-
import net.sharksystem.asap.apps.ASAPMessageReceivedListener;
5-
import net.sharksystem.asap.apps.ASAPSimplePeer;
63
import net.sharksystem.asap.listenermanager.ASAPEnvironmentChangesListenerManager;
74
import net.sharksystem.asap.listenermanager.ASAPMessageReceivedListenerManager;
85

9-
public abstract class ASAPBasicAbstractPeer implements ASAPSimplePeer {
10-
protected final CharSequence peerName;
11-
12-
protected ASAPBasicAbstractPeer(CharSequence peerName) {
13-
this.peerName = peerName;
14-
}
15-
6+
public abstract class ASAPListenerManagingPeer implements ASAPPeer {
167
////////////////////////////////////////////////////////////////////////////////////////////////////////
178
// ASAPMessageReceivedListener //
189
////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -51,7 +42,7 @@ public void removeASAPEnvironmentChangesListener(ASAPEnvironmentChangesListener
5142

5243
protected void log(String msg) {
5344
StringBuilder sb = new StringBuilder();
54-
sb.append(this.peerName);
45+
sb.append(this.getPeerName());
5546
sb.append(": ");
5647
sb.append(msg);
5748

src/net/sharksystem/asap/apps/ASAPMessageReceivedListener.java renamed to src/net/sharksystem/asap/ASAPMessageReceivedListener.java

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

3-
import net.sharksystem.asap.ASAPMessages;
3+
import net.sharksystem.asap.internals.ASAPMessages;
44

55
import java.io.IOException;
66

src/net/sharksystem/asap/apps/ASAPMessageReceivedListenerManagement.java renamed to src/net/sharksystem/asap/ASAPMessageReceivedListenerManagement.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package net.sharksystem.asap.apps;
1+
package net.sharksystem.asap;
22

33
public interface ASAPMessageReceivedListenerManagement {
44
/**

src/net/sharksystem/asap/apps/ASAPMessageSender.java renamed to src/net/sharksystem/asap/ASAPMessageSender.java

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

3-
import net.sharksystem.asap.ASAPException;
3+
import net.sharksystem.asap.internals.ASAPException;
44

55
public interface ASAPMessageSender {
66
/**

‎src/net/sharksystem/asap/ASAPOnlinePeersChangedListener.java‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎src/net/sharksystem/asap/ASAPPeer.java‎

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

3-
import net.sharksystem.asap.protocol.*;
4-
import net.sharksystem.crypto.BasicKeyStore;
5-
6-
import java.io.IOException;
7-
import java.io.OutputStream;
8-
import java.util.Set;
9-
10-
/**
11-
* There is an ASAPEngine that stores its data with a filesystem.
12-
* One significant parameter is a root directory.
13-
*
14-
* It is good practice to use a different root for each application.
15-
*
16-
* It is also common that more than one ASAP based app is running
17-
* on one machine. Thus, different ASAP filesystem based engine are
18-
* to deal with the data depending on the ASAP format.
19-
*
20-
* That interface hides those different engines.
21-
*/
22-
public interface ASAPPeer extends ASAPConnectionHandler {
23-
long DEFAULT_MAX_PROCESSING_TIME = Long.MAX_VALUE;
24-
25-
/**
26-
* get an existing engine
27-
* @param format
28-
* @return
29-
* @throws ASAPException engine does not exist
30-
* @throws IOException
31-
*/
32-
ASAPEngine getEngineByFormat(CharSequence format) throws ASAPException, IOException;
33-
34-
/**
35-
* return already existing or create an engine for a given format / application name
36-
* @param format
37-
* @return
38-
* @throws ASAPException
39-
* @throws IOException
40-
*/
41-
ASAPEngine createEngineByFormat(CharSequence format) throws ASAPException, IOException;
42-
43-
ASAPChunkReceivedListener getListenerByFormat(CharSequence format) throws ASAPException;
44-
45-
/**
46-
* get or create engine for a given application - mainly means: setup folder
47-
* @param format
48-
* @return
49-
*/
50-
ASAPEngine getASAPEngine(CharSequence format) throws IOException, ASAPException;
51-
52-
void pushInterests(OutputStream os) throws IOException, ASAPException;
53-
54-
Set<CharSequence> getOnlinePeers();
55-
56-
boolean existASAPConnection(CharSequence recipient);
57-
58-
ASAPConnection getASAPConnection(CharSequence recipient);
59-
60-
CharSequence getOwner();
61-
62-
void newEra() throws IOException, ASAPException;
63-
64-
void setASAPChunkReceivedListener(CharSequence appName, ASAPChunkReceivedListener listener) throws ASAPException;
65-
66-
void addOnlinePeersChangedListener(ASAPOnlinePeersChangedListener listener);
67-
68-
void removeOnlinePeersChangedListener(ASAPOnlinePeersChangedListener listener);
69-
70-
/**
71-
* @return true if the asap management engine is up and running
72-
*/
73-
boolean isASAPManagementEngineRunning();
74-
75-
EngineSetting getEngineSettings(CharSequence format) throws ASAPException;
76-
77-
/**
78-
* @return all formats currently supported by this mulit engine
79-
*/
80-
Set<CharSequence> getFormats();
81-
82-
void activateOnlineMessages();
83-
void deactivateOnlineMessages();
84-
85-
/**
86-
* This message is only transmitted with open connections. Message is not stored. Nothing happens if no open
87-
* connection is present.
88-
* @param format
89-
* @param urlTarget
90-
* @param recipients
91-
* @param messageAsBytes
92-
* @param era
93-
* @throws IOException
94-
* @throws ASAPException
95-
*/
96-
void sendOnlineASAPAssimilateMessage(CharSequence format, CharSequence urlTarget, Set<CharSequence> recipients,
97-
byte[] messageAsBytes, int era) throws IOException, ASAPException;
98-
99-
void sendOnlineASAPAssimilateMessage(CharSequence format, CharSequence urlTarget, Set<CharSequence> recipients,
100-
byte[] messageAsBytes) throws IOException, ASAPException;
101-
102-
void sendOnlineASAPAssimilateMessage(CharSequence format, CharSequence urlTarget, byte[] messageAsBytes)
103-
throws IOException, ASAPException;
104-
105-
void setASAPBasicKeyStorage(BasicKeyStore basicKeyStore);
106-
107-
ASAPCommunicationSetting getASAPCommunicationControl();
108-
109-
BasicKeyStore getBasicCryptoParameters() throws ASAPSecurityException;
110-
111-
void setSecurityAdministrator(DefaultSecurityAdministrator securityAdministrator);
3+
public interface ASAPPeer extends
4+
ASAPMessageSender,
5+
ASAPEnvironmentChangesListenerManagement,
6+
ASAPMessageReceivedListenerManagement
7+
{
8+
CharSequence getPeerName();
1129
}

0 commit comments

Comments
 (0)