[500277] Many IndicationWithMonitoring with wrong ProgressMonitoring, e.g., UnitIndication

https://bugs.eclipse.org/bugs/show_bug.cgi?id=500277

9 files changed, 54 insertions, 0 deletions

diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CredentialsChallengeIndication.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CredentialsChallengeIndication.java
index 2956c93dc4..a08935909f 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CredentialsChallengeIndication.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CredentialsChallengeIndication.java
@@ -63,6 +63,12 @@ public class CredentialsChallengeIndication extends IndicationWithMonitoring
   }
 
   @Override
+  protected int getIndicatingWorkPercent()
+  {
+    return 1;
+  }
+
+  @Override
   protected void indicating(ExtendedDataInputStream in, OMMonitor monitor) throws Exception
   {
     operation = in.readEnum(CredentialsUpdateOperation.class);
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/ChangeCredentialsIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/ChangeCredentialsIndication.java
index fc2ff7073f..cae748bc21 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/ChangeCredentialsIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/ChangeCredentialsIndication.java
@@ -41,6 +41,12 @@ public class ChangeCredentialsIndication extends CDOServerIndicationWithMonitori
   }
 
   @Override
+  protected int getIndicatingWorkPercent()
+  {
+    return 20;
+  }
+
+  @Override
   protected void indicating(CDODataInput in, OMMonitor monitor) throws Exception
   {
     operation = in.readEnum(CredentialsUpdateOperation.class);
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadMergeDataIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadMergeDataIndication.java
index 98a3d3d3cf..98b5fde638 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadMergeDataIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadMergeDataIndication.java
@@ -50,6 +50,12 @@ public class LoadMergeDataIndication extends CDOServerReadIndicationWithMonitori
   }
 
   @Override
+  protected int getIndicatingWorkPercent()
+  {
+    return 10;
+  }
+
+  @Override
   protected void indicating(CDODataInput in, OMMonitor monitor) throws Exception
   {
     infos = in.readInt();
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/OpenSessionIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/OpenSessionIndication.java
index 8ab7f575ed..2c20997c8f 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/OpenSessionIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/OpenSessionIndication.java
@@ -78,6 +78,12 @@ public class OpenSessionIndication extends CDOServerIndicationWithMonitoring
   }
 
   @Override
+  protected int getIndicatingWorkPercent()
+  {
+    return 10;
+  }
+
+  @Override
   protected void indicating(CDODataInput in, OMMonitor monitor) throws Exception
   {
     repositoryName = in.readString();
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/ReplicateRepositoryRawIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/ReplicateRepositoryRawIndication.java
index c7870e17db..fcc5185f5a 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/ReplicateRepositoryRawIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/ReplicateRepositoryRawIndication.java
@@ -35,6 +35,12 @@ public class ReplicateRepositoryRawIndication extends CDOServerReadIndicationWit
   }
 
   @Override
+  protected int getIndicatingWorkPercent()
+  {
+    return 1;
+  }
+
+  @Override
   protected void indicating(CDODataInput in, OMMonitor monitor) throws IOException
   {
     try
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/SwitchTargetIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/SwitchTargetIndication.java
index 46e9593710..9d359154a7 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/SwitchTargetIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/SwitchTargetIndication.java
@@ -40,6 +40,12 @@ public class SwitchTargetIndication extends CDOServerReadIndicationWithMonitorin
   }
 
   @Override
+  protected int getIndicatingWorkPercent()
+  {
+    return 90;
+  }
+
+  @Override
   protected void indicating(CDODataInput in, OMMonitor monitor) throws IOException
   {
     try
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/UnitIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/UnitIndication.java
index 65d7f79694..9e09aef776 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/UnitIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/UnitIndication.java
@@ -45,6 +45,12 @@ public class UnitIndication extends CDOServerReadIndicationWithMonitoring
   }
 
   @Override
+  protected int getIndicatingWorkPercent()
+  {
+    return 1;
+  }
+
+  @Override
   protected void indicating(CDODataInput in, OMMonitor monitor) throws Exception
   {
     viewID = in.readInt();
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/confirmation/ConfirmationIndication.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/confirmation/ConfirmationIndication.java
index 09577b229d..cb0797443c 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/confirmation/ConfirmationIndication.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/confirmation/ConfirmationIndication.java
@@ -47,6 +47,12 @@ public class ConfirmationIndication<PROTOCOL extends SignalProtocol<?> & IConfir
   }
 
   @Override
+  protected int getIndicatingWorkPercent()
+  {
+    return 1;
+  }
+
+  @Override
   protected void indicating(ExtendedDataInputStream in, OMMonitor monitor) throws Exception
   {
     prompt = ConfirmationPrompt.read(in);
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/security/AuthenticationIndication.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/security/AuthenticationIndication.java
index 9c7e3b1206..6974cd62f7 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/security/AuthenticationIndication.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/security/AuthenticationIndication.java
@@ -61,6 +61,12 @@ public class AuthenticationIndication extends IndicationWithMonitoring
   }
 
   @Override
+  protected int getIndicatingWorkPercent()
+  {
+    return 1;
+  }
+
+  @Override
   protected void indicating(ExtendedDataInputStream in, OMMonitor monitor) throws Exception
   {
     challenge = new Challenge(in);