Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2016-09-13 12:05:55 -0400
committerEike Stepper2016-09-13 12:05:55 -0400
commitb1784ae13b633a96f5efec9b527700e1c2c59607 (patch)
tree0afac783b5a45983b1aceb70901e4e1fac55e3a6 /plugins/org.eclipse.emf.cdo.server.net4j
parent323bd274375e54e4f740ba074098d50df59e9fc9 (diff)
downloadcdo-b1784ae13b633a96f5efec9b527700e1c2c59607.tar.gz
cdo-b1784ae13b633a96f5efec9b527700e1c2c59607.tar.xz
cdo-b1784ae13b633a96f5efec9b527700e1c2c59607.zip
[500277] Many IndicationWithMonitoring with wrong ProgressMonitoring, e.g., UnitIndication
https://bugs.eclipse.org/bugs/show_bug.cgi?id=500277
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.server.net4j')
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/ChangeCredentialsIndication.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadMergeDataIndication.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/OpenSessionIndication.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/ReplicateRepositoryRawIndication.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/SwitchTargetIndication.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/UnitIndication.java6
6 files changed, 36 insertions, 0 deletions
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();

Back to the top