Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Michel-Lemieux2004-02-27 01:32:16 +0000
committerJean Michel-Lemieux2004-02-27 01:32:16 +0000
commit135d9cee6e66707f8388d8fe3e3eec9d9e038acb (patch)
tree8d6a3543e5ab8faaeb1c67f0e8c0977d8996404c
parent577eed06a5e508ddcdd901e8d0fe62a9c6388ff8 (diff)
downloadeclipse.platform.team-135d9cee6e66707f8388d8fe3e3eec9d9e038acb.tar.gz
eclipse.platform.team-135d9cee6e66707f8388d8fe3e3eec9d9e038acb.tar.xz
eclipse.platform.team-135d9cee6e66707f8388d8fe3e3eec9d9e038acb.zip
Bug 53241Can't open Synchronize View
reading subscriber state from disk was not liking an invalid mode int.
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/subscriber/SubscriberParticipant.java19
1 files changed, 14 insertions, 5 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/subscriber/SubscriberParticipant.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/subscriber/SubscriberParticipant.java
index 86478312e..5a9ef43d3 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/subscriber/SubscriberParticipant.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/subscriber/SubscriberParticipant.java
@@ -257,18 +257,27 @@ public abstract class SubscriberParticipant extends AbstractSynchronizeParticipa
if(memento != null) {
IMemento settings = memento.getChild(CTX_SUBSCRIBER_PARTICIPANT_SETTINGS);
if(settings != null) {
- String set = settings.getString(P_SYNCVIEWPAGE_WORKINGSET);
- String mode = settings.getString(P_SYNCVIEWPAGE_MODE);
+ String setSetting = settings.getString(P_SYNCVIEWPAGE_WORKINGSET);
+ String modeSetting = settings.getString(P_SYNCVIEWPAGE_MODE);
SubscriberRefreshSchedule schedule = SubscriberRefreshSchedule.init(settings.getChild(CTX_SUBSCRIBER_SCHEDULE_SETTINGS), this);
setRefreshSchedule(schedule);
- if(set != null) {
- IWorkingSet workingSet = PlatformUI.getWorkbench().getWorkingSetManager().getWorkingSet(set);
+ if(setSetting != null) {
+ IWorkingSet workingSet = PlatformUI.getWorkbench().getWorkingSetManager().getWorkingSet(setSetting);
if(workingSet != null) {
setWorkingSet(workingSet);
}
}
- setMode(Integer.parseInt(mode));
+
+ int mode = SubscriberParticipant.BOTH_MODE;
+ if(modeSetting != null) {
+ try {
+ mode = Integer.parseInt(modeSetting);
+ } catch (NumberFormatException e) {
+ mode = SubscriberParticipant.BOTH_MODE;
+ }
+ }
+ setMode(mode);
}
} else {
setMode(BOTH_MODE);

Back to the top