Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2008-11-04 09:58:14 +0000
committerEike Stepper2008-11-04 09:58:14 +0000
commit29d2ec870a4666f4ddfba4bcd0727aa60953eafc (patch)
tree58ca1d644294f6c2fb41b6ed6a19a96dd553dea0 /plugins/org.eclipse.net4j.buddies
parentaac49607637484bcd3de42fa09393b2f896caa10 (diff)
downloadcdo-29d2ec870a4666f4ddfba4bcd0727aa60953eafc.tar.gz
cdo-29d2ec870a4666f4ddfba4bcd0727aa60953eafc.tar.xz
cdo-29d2ec870a4666f4ddfba4bcd0727aa60953eafc.zip
[252221] Provide proper RemoteException for signals
https://bugs.eclipse.org/bugs/show_bug.cgi?id=252221
Diffstat (limited to 'plugins/org.eclipse.net4j.buddies')
-rw-r--r--plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddyAddedIndication.java3
-rw-r--r--plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddyRemovedIndication.java3
-rw-r--r--plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/CollaborationInitiatedIndication.java3
-rw-r--r--plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/FacilityInstalledIndication.java3
-rw-r--r--plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InitiateCollaborationRequest.java5
-rw-r--r--plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InstallFacilityRequest.java5
-rw-r--r--plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InviteBuddiesNotification.java3
-rw-r--r--plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/LoadAccountRequest.java5
-rw-r--r--plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/OpenSessionRequest.java5
9 files changed, 13 insertions, 22 deletions
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddyAddedIndication.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddyAddedIndication.java
index 2af02f5310..625a70b4c9 100644
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddyAddedIndication.java
+++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddyAddedIndication.java
@@ -16,7 +16,6 @@ import org.eclipse.net4j.signal.Indication;
import org.eclipse.net4j.signal.SignalProtocol;
import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-import java.io.IOException;
/**
* @author Eike Stepper
@@ -29,7 +28,7 @@ public class BuddyAddedIndication extends Indication
}
@Override
- protected void indicating(ExtendedDataInputStream in) throws IOException
+ protected void indicating(ExtendedDataInputStream in) throws Exception
{
String buddy = in.readString();
ClientSession session = ((BuddiesClientProtocol)getProtocol()).getSession();
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddyRemovedIndication.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddyRemovedIndication.java
index 45d8e5cee9..546d79cffd 100644
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddyRemovedIndication.java
+++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddyRemovedIndication.java
@@ -16,7 +16,6 @@ import org.eclipse.net4j.signal.Indication;
import org.eclipse.net4j.signal.SignalProtocol;
import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-import java.io.IOException;
/**
* @author Eike Stepper
@@ -29,7 +28,7 @@ public class BuddyRemovedIndication extends Indication
}
@Override
- protected void indicating(ExtendedDataInputStream in) throws IOException
+ protected void indicating(ExtendedDataInputStream in) throws Exception
{
String buddy = in.readString();
ClientSession session = ((BuddiesClientProtocol)getProtocol()).getSession();
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/CollaborationInitiatedIndication.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/CollaborationInitiatedIndication.java
index 026e595c71..532dfec669 100644
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/CollaborationInitiatedIndication.java
+++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/CollaborationInitiatedIndication.java
@@ -20,7 +20,6 @@ import org.eclipse.net4j.internal.buddies.Self;
import org.eclipse.net4j.signal.Indication;
import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-import java.io.IOException;
import java.util.Set;
/**
@@ -34,7 +33,7 @@ public class CollaborationInitiatedIndication extends Indication
}
@Override
- protected void indicating(ExtendedDataInputStream in) throws IOException
+ protected void indicating(ExtendedDataInputStream in) throws Exception
{
IBuddySession session = (IBuddySession)getProtocol().getInfraStructure();
Self self = (Self)session.getSelf();
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/FacilityInstalledIndication.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/FacilityInstalledIndication.java
index 080739a1c8..0ca03820a8 100644
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/FacilityInstalledIndication.java
+++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/FacilityInstalledIndication.java
@@ -18,7 +18,6 @@ import org.eclipse.net4j.internal.buddies.Self;
import org.eclipse.net4j.signal.Indication;
import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-import java.io.IOException;
/**
* @author Eike Stepper
@@ -31,7 +30,7 @@ public class FacilityInstalledIndication extends Indication
}
@Override
- protected void indicating(ExtendedDataInputStream in) throws IOException
+ protected void indicating(ExtendedDataInputStream in) throws Exception
{
long collaborationID = in.readLong();
String facilityType = in.readString();
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InitiateCollaborationRequest.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InitiateCollaborationRequest.java
index f9090e19fd..9467b9bdd7 100644
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InitiateCollaborationRequest.java
+++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InitiateCollaborationRequest.java
@@ -17,7 +17,6 @@ import org.eclipse.net4j.signal.RequestWithConfirmation;
import org.eclipse.net4j.util.io.ExtendedDataInputStream;
import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-import java.io.IOException;
import java.util.Collection;
/**
@@ -34,13 +33,13 @@ public class InitiateCollaborationRequest extends RequestWithConfirmation<Long>
}
@Override
- protected void requesting(ExtendedDataOutputStream out) throws IOException
+ protected void requesting(ExtendedDataOutputStream out) throws Exception
{
ProtocolUtil.writeBuddies(out, buddies);
}
@Override
- protected Long confirming(ExtendedDataInputStream in) throws IOException
+ protected Long confirming(ExtendedDataInputStream in) throws Exception
{
return in.readLong();
}
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InstallFacilityRequest.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InstallFacilityRequest.java
index 6199c86415..8503cd680e 100644
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InstallFacilityRequest.java
+++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InstallFacilityRequest.java
@@ -15,7 +15,6 @@ import org.eclipse.net4j.signal.RequestWithConfirmation;
import org.eclipse.net4j.util.io.ExtendedDataInputStream;
import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-import java.io.IOException;
/**
* @author Eike Stepper
@@ -34,14 +33,14 @@ public class InstallFacilityRequest extends RequestWithConfirmation<Boolean>
}
@Override
- protected void requesting(ExtendedDataOutputStream out) throws IOException
+ protected void requesting(ExtendedDataOutputStream out) throws Exception
{
out.writeLong(collaborationID);
out.writeString(facilityType);
}
@Override
- protected Boolean confirming(ExtendedDataInputStream in) throws IOException
+ protected Boolean confirming(ExtendedDataInputStream in) throws Exception
{
return in.readBoolean();
}
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InviteBuddiesNotification.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InviteBuddiesNotification.java
index 82feef70d1..74cd1c8887 100644
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InviteBuddiesNotification.java
+++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InviteBuddiesNotification.java
@@ -16,7 +16,6 @@ import org.eclipse.net4j.buddies.internal.common.protocol.ProtocolUtil;
import org.eclipse.net4j.signal.Request;
import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-import java.io.IOException;
import java.util.Collection;
/**
@@ -36,7 +35,7 @@ public class InviteBuddiesNotification extends Request
}
@Override
- protected void requesting(ExtendedDataOutputStream out) throws IOException
+ protected void requesting(ExtendedDataOutputStream out) throws Exception
{
out.writeLong(collaborationID);
ProtocolUtil.writeBuddies(out, buddies);
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/LoadAccountRequest.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/LoadAccountRequest.java
index e1cd712849..a4c3d52983 100644
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/LoadAccountRequest.java
+++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/LoadAccountRequest.java
@@ -17,7 +17,6 @@ import org.eclipse.net4j.signal.RequestWithConfirmation;
import org.eclipse.net4j.util.io.ExtendedDataInputStream;
import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-import java.io.IOException;
/**
* @author Eike Stepper
@@ -33,13 +32,13 @@ public class LoadAccountRequest extends RequestWithConfirmation<IAccount>
}
@Override
- protected void requesting(ExtendedDataOutputStream out) throws IOException
+ protected void requesting(ExtendedDataOutputStream out) throws Exception
{
out.writeString(userID);
}
@Override
- protected IAccount confirming(ExtendedDataInputStream in) throws IOException
+ protected IAccount confirming(ExtendedDataInputStream in) throws Exception
{
return ProtocolUtil.readAccount(in);
}
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/OpenSessionRequest.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/OpenSessionRequest.java
index 822ea6b32a..134cee851e 100644
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/OpenSessionRequest.java
+++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/OpenSessionRequest.java
@@ -19,7 +19,6 @@ import org.eclipse.net4j.signal.RequestWithConfirmation;
import org.eclipse.net4j.util.io.ExtendedDataInputStream;
import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-import java.io.IOException;
import java.util.Set;
/**
@@ -42,7 +41,7 @@ public class OpenSessionRequest extends RequestWithConfirmation<IBuddySession>
}
@Override
- protected void requesting(ExtendedDataOutputStream out) throws IOException
+ protected void requesting(ExtendedDataOutputStream out) throws Exception
{
out.writeString(userID);
out.writeString(password);
@@ -54,7 +53,7 @@ public class OpenSessionRequest extends RequestWithConfirmation<IBuddySession>
}
@Override
- protected IBuddySession confirming(ExtendedDataInputStream in) throws IOException
+ protected IBuddySession confirming(ExtendedDataInputStream in) throws Exception
{
IAccount account = ProtocolUtil.readAccount(in);
if (account == null)

Back to the top