Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2006-01-26 19:47:36 +0000
committerMichael Valenta2006-01-26 19:47:36 +0000
commit2b6e3b2e0125848a87edc4e8e7e3f249cd6cea1d (patch)
tree0c751013557658d62341484e6c36aeb0c10cd2c2
parente5d858bfba64899f01a793f10e00589812e4beb9 (diff)
downloadeclipse.platform.team-2b6e3b2e0125848a87edc4e8e7e3f249cd6cea1d.tar.gz
eclipse.platform.team-2b6e3b2e0125848a87edc4e8e7e3f249cd6cea1d.tar.xz
eclipse.platform.team-2b6e3b2e0125848a87edc4e8e7e3f249cd6cea1d.zip
Simplified some class names
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/OutgoingChangesDialog.java8
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/AbstractModelMergeOperation.java4
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CVSResourceMappingParticipant.java4
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelUpdateOperation.java4
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RepositoryProviderOperation.java4
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizard.java4
-rw-r--r--bundles/org.eclipse.team.ui/plugin.xml2
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/CommonViewerAdvisor.java8
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/MergeAction.java3
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/MergeIncomingChangesAction.java4
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelCompareEditorInput.java6
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelProviderAction.java6
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelSynchronizePage.java10
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshModelParticipantJob.java10
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/OpenInCompareAction.java6
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/OpenWithActionGroup.java6
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RefreshActionContribution.java4
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationOperation.java4
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/operations/MergeActionGroup.java6
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/operations/ModelMergeOperation.java (renamed from bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/operations/ResourceMappingMergeOperation.java)12
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/operations/ModelOperation.java (renamed from bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/operations/ResourceMappingOperation.java)4
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/operations/ModelSynchronizeParticipant.java (renamed from bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/operations/ResourceMappingSynchronizeParticipant.java)78
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantPageSaveablePart.java8
-rw-r--r--tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/mapping/ScopeBuildingTests.java4
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/launchConfigurations/One CVS Test.launch4
25 files changed, 130 insertions, 83 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/OutgoingChangesDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/OutgoingChangesDialog.java
index f68413c20..4e34262e6 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/OutgoingChangesDialog.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/OutgoingChangesDialog.java
@@ -28,7 +28,7 @@ import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin;
import org.eclipse.team.internal.ccvs.ui.mappings.WorkspaceSubscriberContext;
import org.eclipse.team.internal.ui.SWTUtils;
import org.eclipse.team.internal.ui.dialogs.DetailsDialog;
-import org.eclipse.team.ui.operations.ResourceMappingSynchronizeParticipant;
+import org.eclipse.team.ui.operations.ModelSynchronizeParticipant;
import org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration;
import org.eclipse.team.ui.synchronize.ParticipantPagePane;
import org.eclipse.ui.PlatformUI;
@@ -38,7 +38,7 @@ public class OutgoingChangesDialog extends DetailsDialog {
private final String message;
private ParticipantPagePane pane;
private final IResourceMappingScope scope;
- private ResourceMappingSynchronizeParticipant participant;
+ private ModelSynchronizeParticipant participant;
private final String title;
private final String detailsMessage;
@@ -108,9 +108,9 @@ public class OutgoingChangesDialog extends DetailsDialog {
return composite;
}
- private ResourceMappingSynchronizeParticipant createParticipant() throws InvocationTargetException, InterruptedException {
+ private ModelSynchronizeParticipant createParticipant() throws InvocationTargetException, InterruptedException {
ISynchronizationContext context = createSynchronizationContext(scope);
- ResourceMappingSynchronizeParticipant participant = ResourceMappingSynchronizeParticipant.createParticipant(context, title);
+ ModelSynchronizeParticipant participant = ModelSynchronizeParticipant.createParticipant(context, title);
participant.setMergingEnabled(false);
return participant;
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/AbstractModelMergeOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/AbstractModelMergeOperation.java
index 797a03f2c..839adfac7 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/AbstractModelMergeOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/AbstractModelMergeOperation.java
@@ -14,10 +14,10 @@ import org.eclipse.core.resources.mapping.ResourceMapping;
import org.eclipse.core.resources.mapping.ResourceMappingContext;
import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin;
import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants;
-import org.eclipse.team.ui.operations.ResourceMappingMergeOperation;
+import org.eclipse.team.ui.operations.ModelMergeOperation;
import org.eclipse.ui.IWorkbenchPart;
-public abstract class AbstractModelMergeOperation extends ResourceMappingMergeOperation {
+public abstract class AbstractModelMergeOperation extends ModelMergeOperation {
private ResourceMappingContext context;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CVSResourceMappingParticipant.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CVSResourceMappingParticipant.java
index 7bad626b4..fac7fabda 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CVSResourceMappingParticipant.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CVSResourceMappingParticipant.java
@@ -21,11 +21,11 @@ import org.eclipse.team.internal.ui.Utils;
import org.eclipse.team.ui.TeamUI;
import org.eclipse.team.ui.mapping.SynchronizationActionProvider;
import org.eclipse.team.ui.operations.MergeActionGroup;
-import org.eclipse.team.ui.operations.ResourceMappingSynchronizeParticipant;
+import org.eclipse.team.ui.operations.ModelSynchronizeParticipant;
import org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration;
public class CVSResourceMappingParticipant extends
- ResourceMappingSynchronizeParticipant {
+ ModelSynchronizeParticipant {
public static final String VIEWER_ID = "org.eclipse.team.cvs.ui.workspaceSynchronization"; //$NON-NLS-1$
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelUpdateOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelUpdateOperation.java
index 09b1d60ac..b5fa18742 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelUpdateOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelUpdateOperation.java
@@ -17,7 +17,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.team.core.mapping.IMergeContext;
import org.eclipse.team.core.mapping.ISynchronizationContext;
import org.eclipse.team.internal.ccvs.ui.*;
-import org.eclipse.team.ui.operations.ResourceMappingSynchronizeParticipant;
+import org.eclipse.team.ui.operations.ModelSynchronizeParticipant;
import org.eclipse.ui.IWorkbenchPart;
public class ModelUpdateOperation extends AbstractModelMergeOperation {
@@ -65,7 +65,7 @@ public class ModelUpdateOperation extends AbstractModelMergeOperation {
/* (non-Javadoc)
* @see org.eclipse.team.ui.operations.ResourceMappingMergeOperation#createParticipant()
*/
- protected ResourceMappingSynchronizeParticipant createParticipant() {
+ protected ModelSynchronizeParticipant createParticipant() {
return new CVSResourceMappingParticipant(getContext(), getJobName());
}
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RepositoryProviderOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RepositoryProviderOperation.java
index 13b34f728..f87da3d7d 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RepositoryProviderOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RepositoryProviderOperation.java
@@ -29,7 +29,7 @@ import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption;
import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot;
import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin;
import org.eclipse.team.internal.ccvs.ui.Policy;
-import org.eclipse.team.ui.operations.ResourceMappingOperation;
+import org.eclipse.team.ui.operations.ModelOperation;
import org.eclipse.ui.IWorkbenchPart;
/**
@@ -209,7 +209,7 @@ public abstract class RepositoryProviderOperation extends CVSOperation {
public IResourceMappingScope buildScope(IProgressMonitor monitor) throws InterruptedException, CVSException {
if (scope == null) {
- ResourceMappingOperation op = new ResourceMappingOperation(getPart(), selectedMappings) {
+ ModelOperation op = new ModelOperation(getPart(), selectedMappings) {
/* (non-Javadoc)
* @see org.eclipse.team.ui.operations.ResourceMappingOperation#execute(org.eclipse.core.runtime.IProgressMonitor)
*/
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizard.java
index 3c15183ff..8e17514c5 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizard.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizard.java
@@ -37,7 +37,7 @@ import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot;
import org.eclipse.team.internal.ccvs.ui.*;
import org.eclipse.team.internal.ccvs.ui.operations.*;
import org.eclipse.team.internal.core.subscribers.SubscriberSyncInfoCollector;
-import org.eclipse.team.ui.operations.ResourceMappingOperation;
+import org.eclipse.team.ui.operations.ModelOperation;
import org.eclipse.team.ui.synchronize.ResourceScope;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.PlatformUI;
@@ -333,7 +333,7 @@ public class CommitWizard extends ResizableWizard {
}
public static IResourceMappingScope buildScope(IWorkbenchPart part, ResourceMapping[] mappings, IProgressMonitor monitor) throws InterruptedException, CVSException {
- ResourceMappingOperation op = new ResourceMappingOperation(part, mappings) {
+ ModelOperation op = new ModelOperation(part, mappings) {
/* (non-Javadoc)
* @see org.eclipse.team.ui.operations.ResourceMappingOperation#execute(org.eclipse.core.runtime.IProgressMonitor)
*/
diff --git a/bundles/org.eclipse.team.ui/plugin.xml b/bundles/org.eclipse.team.ui/plugin.xml
index ba714c4df..eced9f677 100644
--- a/bundles/org.eclipse.team.ui/plugin.xml
+++ b/bundles/org.eclipse.team.ui/plugin.xml
@@ -406,7 +406,7 @@
<participant
name="%ModelSyncParticipant"
icon="$nl$/icons/full/eview16/synch_synch.gif"
- class="org.eclipse.team.ui.operations.ResourceMappingSynchronizeParticipant"
+ class="org.eclipse.team.ui.operations.ModelSynchronizeParticipant"
id="org.eclipse.team.ui.synchronization_context_synchronize_participant">
</participant>
</extension>
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/CommonViewerAdvisor.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/CommonViewerAdvisor.java
index bb64011af..aaf2e93b8 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/CommonViewerAdvisor.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/CommonViewerAdvisor.java
@@ -23,7 +23,7 @@ import org.eclipse.team.internal.ui.registry.TeamContentProviderManager;
import org.eclipse.team.internal.ui.synchronize.AbstractTreeViewerAdvisor;
import org.eclipse.team.ui.mapping.ISynchronizationConstants;
import org.eclipse.team.ui.mapping.SynchronizationStateTester;
-import org.eclipse.team.ui.operations.ResourceMappingSynchronizeParticipant;
+import org.eclipse.team.ui.operations.ModelSynchronizeParticipant;
import org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration;
import org.eclipse.ui.*;
import org.eclipse.ui.actions.ActionContext;
@@ -137,7 +137,7 @@ public class CommonViewerAdvisor extends AbstractTreeViewerAdvisor implements IN
}
private Object getInitialInput() {
- return ((ResourceMappingSynchronizeParticipant)getConfiguration().getParticipant()).getContext();
+ return ((ModelSynchronizeParticipant)getConfiguration().getParticipant()).getContext();
}
/* (non-Javadoc)
@@ -160,8 +160,8 @@ public class CommonViewerAdvisor extends AbstractTreeViewerAdvisor implements IN
}
}
- private ResourceMappingSynchronizeParticipant getParticipant() {
- return (ResourceMappingSynchronizeParticipant)getConfiguration().getParticipant();
+ private ModelSynchronizeParticipant getParticipant() {
+ return (ModelSynchronizeParticipant)getConfiguration().getParticipant();
}
/**
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/MergeAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/MergeAction.java
index d4964b144..28052e720 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/MergeAction.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/MergeAction.java
@@ -21,8 +21,7 @@ import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.swt.widgets.Event;
import org.eclipse.team.internal.ui.*;
import org.eclipse.team.ui.compare.IModelBuffer;
-import org.eclipse.team.ui.mapping.ISynchronizationConstants;
-import org.eclipse.team.ui.mapping.MergeActionHandler;
+import org.eclipse.team.ui.mapping.*;
import org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration;
import org.eclipse.ui.PlatformUI;
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/MergeIncomingChangesAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/MergeIncomingChangesAction.java
index 59ad74310..df7cc319f 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/MergeIncomingChangesAction.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/MergeIncomingChangesAction.java
@@ -24,7 +24,7 @@ import org.eclipse.team.internal.ui.TeamUIMessages;
import org.eclipse.team.internal.ui.Utils;
import org.eclipse.team.ui.compare.IModelBuffer;
import org.eclipse.team.ui.mapping.SynchronizationOperation;
-import org.eclipse.team.ui.operations.ResourceMappingSynchronizeParticipant;
+import org.eclipse.team.ui.operations.ModelSynchronizeParticipant;
import org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration;
import org.eclipse.ui.PlatformUI;
@@ -50,7 +50,7 @@ public class MergeIncomingChangesAction extends ModelProviderAction {
// Cancelled so return
return;
}
- final IMergeContext context = (IMergeContext)((ResourceMappingSynchronizeParticipant)getConfiguration().getParticipant()).getContext();
+ final IMergeContext context = (IMergeContext)((ModelSynchronizeParticipant)getConfiguration().getParticipant()).getContext();
try {
new SynchronizationOperation(getConfiguration()) {
public void run(IProgressMonitor monitor) throws InvocationTargetException,
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelCompareEditorInput.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelCompareEditorInput.java
index d1b3d7db9..f7e9fb591 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelCompareEditorInput.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelCompareEditorInput.java
@@ -8,14 +8,14 @@ import org.eclipse.compare.structuremergeviewer.ICompareInput;
import org.eclipse.core.runtime.*;
import org.eclipse.team.internal.ui.*;
import org.eclipse.team.ui.compare.IPrepareCompareInputAdapter;
-import org.eclipse.team.ui.operations.ResourceMappingSynchronizeParticipant;
+import org.eclipse.team.ui.operations.ModelSynchronizeParticipant;
public class ModelCompareEditorInput extends CompareEditorInput {
- private final ResourceMappingSynchronizeParticipant participant;
+ private final ModelSynchronizeParticipant participant;
private final ICompareInput input;
- public ModelCompareEditorInput(ResourceMappingSynchronizeParticipant participant, ICompareInput input) {
+ public ModelCompareEditorInput(ModelSynchronizeParticipant participant, ICompareInput input) {
super(new CompareConfiguration());
Assert.isNotNull(participant);
Assert.isNotNull(input);
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelProviderAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelProviderAction.java
index aff83dfba..1d56d0a06 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelProviderAction.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelProviderAction.java
@@ -26,13 +26,13 @@ import org.eclipse.team.core.diff.IThreeWayDiff;
import org.eclipse.team.core.mapping.ISynchronizationContext;
import org.eclipse.team.ui.compare.IModelBuffer;
import org.eclipse.team.ui.mapping.ISynchronizationConstants;
-import org.eclipse.team.ui.operations.ResourceMappingSynchronizeParticipant;
+import org.eclipse.team.ui.operations.ModelSynchronizeParticipant;
import org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.actions.BaseSelectionListenerAction;
/**
- * Model provider actions for use with a {@link ResourceMappingSynchronizeParticipant}.
+ * Model provider actions for use with a {@link ModelSynchronizeParticipant}.
* <p>
* <strong>EXPERIMENTAL</strong>. This class or interface has been added as
* part of a work in progress. There is a guarantee neither that this API will
@@ -108,7 +108,7 @@ public abstract class ModelProviderAction extends BaseSelectionListenerAction {
* @return the synchronization context associated with this action
*/
protected ISynchronizationContext getContext() {
- return ((ResourceMappingSynchronizeParticipant)getConfiguration().getParticipant()).getContext();
+ return ((ModelSynchronizeParticipant)getConfiguration().getParticipant()).getContext();
}
/**
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelSynchronizePage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelSynchronizePage.java
index 8cba6452f..b4df53af2 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelSynchronizePage.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelSynchronizePage.java
@@ -14,11 +14,11 @@ import org.eclipse.swt.widgets.Composite;
import org.eclipse.team.core.mapping.ISynchronizationContext;
import org.eclipse.team.internal.ui.synchronize.*;
import org.eclipse.team.internal.ui.synchronize.actions.RefreshActionContribution;
-import org.eclipse.team.ui.operations.ResourceMappingSynchronizeParticipant;
+import org.eclipse.team.ui.operations.ModelSynchronizeParticipant;
import org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration;
/**
- * A synchronize page for displaying a {@link ResourceMappingSynchronizeParticipant}.
+ * A synchronize page for displaying a {@link ModelSynchronizeParticipant}.
* <p>
* <strong>EXPERIMENTAL</strong>. This class or interface has been added as
* part of a work in progress. There is a guarantee neither that this API will
@@ -30,7 +30,7 @@ import org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration;
**/
public class ModelSynchronizePage extends AbstractSynchronizePage {
- private ResourceMappingSynchronizeParticipant participant;
+ private ModelSynchronizeParticipant participant;
/**
* Create a page from the given configuration
@@ -38,7 +38,7 @@ public class ModelSynchronizePage extends AbstractSynchronizePage {
*/
public ModelSynchronizePage(ISynchronizePageConfiguration configuration) {
super(configuration);
- this.participant = (ResourceMappingSynchronizeParticipant)configuration.getParticipant();
+ this.participant = (ModelSynchronizeParticipant)configuration.getParticipant();
configuration.setComparisonType(isThreeWay()
? ISynchronizePageConfiguration.THREE_WAY
: ISynchronizePageConfiguration.TWO_WAY);
@@ -72,7 +72,7 @@ public class ModelSynchronizePage extends AbstractSynchronizePage {
* Return the participant of this page.
* @return the participant of this page
*/
- protected ResourceMappingSynchronizeParticipant getParticipant() {
+ protected ModelSynchronizeParticipant getParticipant() {
return participant;
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshModelParticipantJob.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshModelParticipantJob.java
index 17369f8c8..3502eb026 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshModelParticipantJob.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshModelParticipantJob.java
@@ -17,7 +17,7 @@ import org.eclipse.core.resources.mapping.ResourceMapping;
import org.eclipse.core.runtime.*;
import org.eclipse.team.core.diff.*;
import org.eclipse.team.core.mapping.ISynchronizationContext;
-import org.eclipse.team.ui.operations.ResourceMappingSynchronizeParticipant;
+import org.eclipse.team.ui.operations.ModelSynchronizeParticipant;
import org.eclipse.team.ui.synchronize.ISynchronizeParticipant;
public class RefreshModelParticipantJob extends RefreshParticipantJob {
@@ -47,7 +47,7 @@ public class RefreshModelParticipantJob extends RefreshParticipantJob {
public RefreshModelParticipantJob(ISynchronizeParticipant participant, String jobName, String taskName, ResourceMapping[] mappings, IRefreshSubscriberListener listener) {
super(participant, jobName, taskName, listener);
- ISynchronizationContext context = ((ResourceMappingSynchronizeParticipant)getParticipant()).getContext();
+ ISynchronizationContext context = ((ModelSynchronizeParticipant)getParticipant()).getContext();
if (mappings.length == 0)
this.mappings = context.getScope().getMappings();
else
@@ -56,7 +56,7 @@ public class RefreshModelParticipantJob extends RefreshParticipantJob {
protected void doRefresh(IChangeDescription changeListener,
IProgressMonitor monitor) throws CoreException {
- ISynchronizationContext context = ((ResourceMappingSynchronizeParticipant)getParticipant()).getContext();
+ ISynchronizationContext context = ((ModelSynchronizeParticipant)getParticipant()).getContext();
try {
context.getDiffTree().addDiffChangeListener((ChangeDescription)changeListener);
// TODO: finer grained refresh
@@ -73,7 +73,7 @@ public class RefreshModelParticipantJob extends RefreshParticipantJob {
}
protected int getChangeCount() {
- return ((ResourceMappingSynchronizeParticipant)getParticipant()).getContext().getDiffTree().size();
+ return ((ModelSynchronizeParticipant)getParticipant()).getContext().getDiffTree().size();
}
protected void handleProgressGroupSet(IProgressMonitor group) {
@@ -85,7 +85,7 @@ public class RefreshModelParticipantJob extends RefreshParticipantJob {
}
public boolean belongsTo(Object family) {
- if (family == ((ResourceMappingSynchronizeParticipant)getParticipant()))
+ if (family == ((ModelSynchronizeParticipant)getParticipant()))
return true;
return super.belongsTo(family);
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/OpenInCompareAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/OpenInCompareAction.java
index a7b5988db..bab700f18 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/OpenInCompareAction.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/OpenInCompareAction.java
@@ -23,7 +23,7 @@ import org.eclipse.team.core.synchronize.SyncInfo;
import org.eclipse.team.internal.ui.Utils;
import org.eclipse.team.internal.ui.mapping.ModelCompareEditorInput;
import org.eclipse.team.internal.ui.synchronize.SyncInfoModelElement;
-import org.eclipse.team.ui.operations.ResourceMappingSynchronizeParticipant;
+import org.eclipse.team.ui.operations.ModelSynchronizeParticipant;
import org.eclipse.team.ui.synchronize.*;
import org.eclipse.ui.*;
@@ -68,8 +68,8 @@ public class OpenInCompareAction extends Action {
if (info != null)
return openCompareEditor(participant, info, keepFocus, site);
}
- if (participant instanceof ResourceMappingSynchronizeParticipant) {
- ResourceMappingSynchronizeParticipant msp = (ResourceMappingSynchronizeParticipant) participant;
+ if (participant instanceof ModelSynchronizeParticipant) {
+ ModelSynchronizeParticipant msp = (ModelSynchronizeParticipant) participant;
ICompareInput input = msp.asCompareInput(object);
if (input != null) {
return openCompareEditor(new ModelCompareEditorInput(msp, input), keepFocus, site);
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/OpenWithActionGroup.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/OpenWithActionGroup.java
index 45e6ff6b0..4c6baa768 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/OpenWithActionGroup.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/OpenWithActionGroup.java
@@ -17,7 +17,7 @@ import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.team.internal.ui.TeamUIMessages;
import org.eclipse.team.internal.ui.Utils;
-import org.eclipse.team.ui.operations.ResourceMappingSynchronizeParticipant;
+import org.eclipse.team.ui.operations.ModelSynchronizeParticipant;
import org.eclipse.team.ui.synchronize.ISynchronizePageSite;
import org.eclipse.team.ui.synchronize.ISynchronizeParticipant;
import org.eclipse.ui.IWorkbenchSite;
@@ -72,8 +72,8 @@ public class OpenWithActionGroup extends ActionGroup {
if(resources.length == 0) {
// We can still show the compare editor open if the element has a compare input
if (elements.length == 1) {
- if (participant instanceof ResourceMappingSynchronizeParticipant) {
- ResourceMappingSynchronizeParticipant msp = (ResourceMappingSynchronizeParticipant) participant;
+ if (participant instanceof ModelSynchronizeParticipant) {
+ ModelSynchronizeParticipant msp = (ModelSynchronizeParticipant) participant;
// TODO: This is inefficient
if (msp.hasCompareInputFor(elements[0])) {
menu.appendToGroup(groupId, openInCompareAction);
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RefreshActionContribution.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RefreshActionContribution.java
index 9d3fda31c..9b58f9986 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RefreshActionContribution.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RefreshActionContribution.java
@@ -17,7 +17,7 @@ import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.team.internal.ui.Utils;
import org.eclipse.team.internal.ui.synchronize.ConfigureRefreshScheduleDialog;
import org.eclipse.team.internal.ui.synchronize.IRefreshable;
-import org.eclipse.team.ui.operations.ResourceMappingSynchronizeParticipant;
+import org.eclipse.team.ui.operations.ModelSynchronizeParticipant;
import org.eclipse.team.ui.synchronize.*;
import org.eclipse.ui.IActionBars;
@@ -32,7 +32,7 @@ public class RefreshActionContribution extends SynchronizePageActionGroup {
public void initialize(final ISynchronizePageConfiguration configuration) {
super.initialize(configuration);
final ISynchronizePageSite site = configuration.getSite();
- final ResourceMappingSynchronizeParticipant participant = (ResourceMappingSynchronizeParticipant)configuration.getParticipant();
+ final ModelSynchronizeParticipant participant = (ModelSynchronizeParticipant)configuration.getParticipant();
// toolbar
if (participant.doesSupportSynchronize()) {
refreshSelectionAction = new Action() {
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationOperation.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationOperation.java
index dc6ee3441..518e4662e 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationOperation.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationOperation.java
@@ -14,7 +14,7 @@ import org.eclipse.team.core.mapping.IMergeContext;
import org.eclipse.team.core.mapping.ISynchronizationContext;
import org.eclipse.team.ui.TeamOperation;
import org.eclipse.team.ui.compare.IModelBuffer;
-import org.eclipse.team.ui.operations.ResourceMappingSynchronizeParticipant;
+import org.eclipse.team.ui.operations.ModelSynchronizeParticipant;
import org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration;
import org.eclipse.team.ui.synchronize.ISynchronizePageSite;
import org.eclipse.ui.IWorkbenchPart;
@@ -68,7 +68,7 @@ public abstract class SynchronizationOperation extends TeamOperation {
* @return the synchronization context associated with this action
*/
protected ISynchronizationContext getContext() {
- return ((ResourceMappingSynchronizeParticipant)getConfiguration().getParticipant()).getContext();
+ return ((ModelSynchronizeParticipant)getConfiguration().getParticipant()).getContext();
}
/**
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/operations/MergeActionGroup.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/operations/MergeActionGroup.java
index f0e973187..e063c8e1c 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/operations/MergeActionGroup.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/operations/MergeActionGroup.java
@@ -65,7 +65,7 @@ public class MergeActionGroup extends SynchronizePageActionGroup {
public void initialize(ISynchronizePageConfiguration configuration) {
super.initialize(configuration);
- ResourceMappingSynchronizeParticipant participant = ((ResourceMappingSynchronizeParticipant)configuration.getParticipant());
+ ModelSynchronizeParticipant participant = ((ModelSynchronizeParticipant)configuration.getParticipant());
if (participant.isMergingEnabled()) {
updateToolbarAction = new MergeIncomingChangesAction(configuration);
configureMergeAction(MERGE_ALL_ACTION_ID, updateToolbarAction);
@@ -98,7 +98,7 @@ public class MergeActionGroup extends SynchronizePageActionGroup {
* @param cmm the menu manager
*/
private void addMergeActions(CommonMenuManager cmm) {
- ResourceMappingSynchronizeParticipant participant = ((ResourceMappingSynchronizeParticipant)getConfiguration().getParticipant());
+ ModelSynchronizeParticipant participant = ((ModelSynchronizeParticipant)getConfiguration().getParticipant());
if (participant.isMergingEnabled()) {
if (!isTwoWayMerge()) {
MergeAction merge = new MergeAction(SynchronizationActionProvider.MERGE_ACTION_ID, cmm, getConfiguration());
@@ -147,7 +147,7 @@ public class MergeActionGroup extends SynchronizePageActionGroup {
}
private boolean isTwoWayMerge() {
- ResourceMappingSynchronizeParticipant participant = ((ResourceMappingSynchronizeParticipant)getConfiguration().getParticipant());
+ ModelSynchronizeParticipant participant = ((ModelSynchronizeParticipant)getConfiguration().getParticipant());
ISynchronizationContext context = participant.getContext();
if (context instanceof IMergeContext) {
IMergeContext mc = (IMergeContext) context;
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/operations/ResourceMappingMergeOperation.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/operations/ModelMergeOperation.java
index 6bbb07ef5..b34098496 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/operations/ResourceMappingMergeOperation.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/operations/ModelMergeOperation.java
@@ -101,7 +101,7 @@ import org.eclipse.ui.PlatformUI;
*
* @since 3.2
*/
-public abstract class ResourceMappingMergeOperation extends ResourceMappingOperation {
+public abstract class ModelMergeOperation extends ModelOperation {
private static final int DONE_ID = IDialogConstants.CLIENT_ID + 1;
private static final int REPLACE_ID = IDialogConstants.CLIENT_ID + 2;
@@ -113,7 +113,7 @@ public abstract class ResourceMappingMergeOperation extends ResourceMappingOpera
* @param part the workbench part from which the merge was launched or <code>null</code>
* @param selectedMappings the selected mappings
*/
- protected ResourceMappingMergeOperation(IWorkbenchPart part, ResourceMapping[] selectedMappings) {
+ protected ModelMergeOperation(IWorkbenchPart part, ResourceMapping[] selectedMappings) {
super(part, selectedMappings);
}
@@ -195,7 +195,7 @@ public abstract class ResourceMappingMergeOperation extends ResourceMappingOpera
calculateStates(context, Policy.subMonitorFor(monitor, 5));
Display.getDefault().asyncExec(new Runnable() {
public void run() {
- ResourceMappingSynchronizeParticipant participant = createParticipant();
+ ModelSynchronizeParticipant participant = createParticipant();
if (isPreviewInDialog()) {
CompareConfiguration cc = new CompareConfiguration();
ISynchronizePageConfiguration pageConfiguration = participant.createPageConfiguration();
@@ -379,7 +379,7 @@ public abstract class ResourceMappingMergeOperation extends ResourceMappingOpera
/**
* Create the synchronize pariticipant to be used by this operation
- * to preview changes. By default, a {@link ResourceMappingSynchronizeParticipant}
+ * to preview changes. By default, a {@link ModelSynchronizeParticipant}
* is created using he context ({@link #getContext()}) and job name ({@link #getJobName()})
* of this operation. Subclasses may override this method.
* <p>
@@ -387,8 +387,8 @@ public abstract class ResourceMappingMergeOperation extends ResourceMappingOpera
* synchronization context when it is no longer needed.
* @return a newly created synchronize pariticipant to be used by this operation
*/
- protected ResourceMappingSynchronizeParticipant createParticipant() {
- return ResourceMappingSynchronizeParticipant.createParticipant(getContext(), getJobName());
+ protected ModelSynchronizeParticipant createParticipant() {
+ return ModelSynchronizeParticipant.createParticipant(getContext(), getJobName());
}
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/operations/ResourceMappingOperation.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/operations/ModelOperation.java
index ec8324379..8ba35974e 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/operations/ResourceMappingOperation.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/operations/ModelOperation.java
@@ -42,7 +42,7 @@ import org.eclipse.ui.IWorkbenchPart;
*
* @since 3.2
*/
-public abstract class ResourceMappingOperation extends TeamOperation {
+public abstract class ModelOperation extends TeamOperation {
private final ResourceMapping[] selectedMappings;
private IResourceMappingScope scope;
@@ -53,7 +53,7 @@ public abstract class ResourceMappingOperation extends TeamOperation {
* @param part the workbench part from which the merge was launched or <code>null</code>
* @param selectedMappings the selected mappings
*/
- protected ResourceMappingOperation(IWorkbenchPart part, ResourceMapping[] selectedMappings) {
+ protected ModelOperation(IWorkbenchPart part, ResourceMapping[] selectedMappings) {
super(part);
this.selectedMappings = selectedMappings;
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/operations/ResourceMappingSynchronizeParticipant.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/operations/ModelSynchronizeParticipant.java
index fbb44f9f6..90034f99f 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/operations/ResourceMappingSynchronizeParticipant.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/operations/ModelSynchronizeParticipant.java
@@ -24,8 +24,7 @@ import org.eclipse.team.ui.TeamUI;
import org.eclipse.team.ui.mapping.ICompareAdapter;
import org.eclipse.team.ui.mapping.ISynchronizationConstants;
import org.eclipse.team.ui.synchronize.*;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchSite;
+import org.eclipse.ui.*;
import org.eclipse.ui.part.IPageBookViewPage;
/**
@@ -42,15 +41,27 @@ import org.eclipse.ui.part.IPageBookViewPage;
*
* @since 3.2
**/
-public class ResourceMappingSynchronizeParticipant extends
+public class ModelSynchronizeParticipant extends
AbstractSynchronizeParticipant {
- private ISynchronizationContext context;
+ /*
+ * Key for settings in memento
+ */
+ private static final String CTX_PARTICIPANT_SETTINGS = TeamUIPlugin.ID + ".MODEL_PARTICIPANT_SETTINGS"; //$NON-NLS-1$
- private boolean mergingEnabled = true;
+ /*
+ * Key for schedule in memento
+ */
+ private static final String CTX_REFRESH_SCHEDULE_SETTINGS = TeamUIPlugin.ID + ".MODEL_PARTICIPANT_REFRESH_SCHEDULE"; //$NON-NLS-1$
+ /*
+ * Key for description in memento
+ */
+ private static final String CTX_DESCRIPTION = TeamUIPlugin.ID + ".MODEL_PARTICIPANT_DESCRIPTION"; //$NON-NLS-1$
+
+ private ISynchronizationContext context;
+ private boolean mergingEnabled = true;
protected SubscriberRefreshSchedule refreshSchedule;
-
private String description;
/**
@@ -58,8 +69,8 @@ public class ResourceMappingSynchronizeParticipant extends
* @param context the synchronization context
* @param name the name of the participant
*/
- public static ResourceMappingSynchronizeParticipant createParticipant(ISynchronizationContext context, String name) {
- return new ResourceMappingSynchronizeParticipant(context, name);
+ public static ModelSynchronizeParticipant createParticipant(ISynchronizationContext context, String name) {
+ return new ModelSynchronizeParticipant(context, name);
}
/*
@@ -67,7 +78,7 @@ public class ResourceMappingSynchronizeParticipant extends
* @param context the synchronization context
* @param name the name of the participant
*/
- private ResourceMappingSynchronizeParticipant(ISynchronizationContext context, String name) {
+ private ModelSynchronizeParticipant(ISynchronizationContext context, String name) {
initializeContext(context);
try {
setInitializationData(TeamUI.getSynchronizeManager().getParticipantDescriptor("org.eclipse.team.ui.synchronization_context_synchronize_participant")); //$NON-NLS-1$
@@ -84,7 +95,7 @@ public class ResourceMappingSynchronizeParticipant extends
* Create a participant for the given context
* @param context the synchronization context
*/
- public ResourceMappingSynchronizeParticipant(ISynchronizationContext context) {
+ public ModelSynchronizeParticipant(ISynchronizationContext context) {
initializeContext(context);
mergingEnabled = context instanceof IMergeContext;
refreshSchedule = new SubscriberRefreshSchedule(createRefreshable());
@@ -297,17 +308,17 @@ public class ResourceMappingSynchronizeParticipant extends
return new IRefreshable() {
public RefreshParticipantJob createJob(String interval) {
- return new RefreshModelParticipantJob(ResourceMappingSynchronizeParticipant.this,
+ return new RefreshModelParticipantJob(ModelSynchronizeParticipant.this,
TeamUIMessages.RefreshSchedule_14,
- NLS.bind(TeamUIMessages.RefreshSchedule_15, new String[] { ResourceMappingSynchronizeParticipant.this.getName(), interval }),
+ NLS.bind(TeamUIMessages.RefreshSchedule_15, new String[] { ModelSynchronizeParticipant.this.getName(), interval }),
new ResourceMapping[0],
- new RefreshUserNotificationPolicy(ResourceMappingSynchronizeParticipant.this));
+ new RefreshUserNotificationPolicy(ModelSynchronizeParticipant.this));
}
public ISynchronizeParticipant getParticipant() {
- return ResourceMappingSynchronizeParticipant.this;
+ return ModelSynchronizeParticipant.this;
}
public void setRefreshSchedule(SubscriberRefreshSchedule schedule) {
- refreshSchedule = schedule;
+ ModelSynchronizeParticipant.this.setRefreshSchedule(schedule);
}
public SubscriberRefreshSchedule getRefreshSchedule() {
return refreshSchedule;
@@ -327,4 +338,41 @@ public class ResourceMappingSynchronizeParticipant extends
return super.getAdapter(adapter);
}
+ /* (non-Javadoc)
+ * @see org.eclipse.team.ui.synchronize.ISynchronizeParticipant#saveState(org.eclipse.ui.IMemento)
+ */
+ public void saveState(IMemento memento) {
+ super.saveState(memento);
+ IMemento settings = memento.createChild(CTX_PARTICIPANT_SETTINGS);
+ if (description != null)
+ settings.putString(CTX_DESCRIPTION, description);
+ refreshSchedule.saveState(settings.createChild(CTX_REFRESH_SCHEDULE_SETTINGS));
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.team.ui.synchronize.ISynchronizeParticipant#init(org.eclipse.ui.IMemento)
+ */
+ public void init(String secondaryId, IMemento memento) throws PartInitException {
+ super.init(secondaryId, memento);
+ if(memento != null) {
+ IMemento settings = memento.getChild(CTX_PARTICIPANT_SETTINGS);
+ if(settings != null) {
+ SubscriberRefreshSchedule schedule = SubscriberRefreshSchedule.init(settings.getChild(CTX_REFRESH_SCHEDULE_SETTINGS), createRefreshable());
+ description = settings.getString(CTX_DESCRIPTION);
+ setRefreshSchedule(schedule);
+ }
+ }
+ }
+
+ /* private */ void setRefreshSchedule(SubscriberRefreshSchedule schedule) {
+ if (refreshSchedule != schedule) {
+ if (refreshSchedule != null) {
+ refreshSchedule.dispose();
+ }
+ this.refreshSchedule = schedule;
+ }
+ // Always fir the event since the schedule may have been changed
+ firePropertyChange(this, AbstractSynchronizeParticipant.P_SCHEDULED, schedule, schedule);
+ }
+
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantPageSaveablePart.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantPageSaveablePart.java
index c15f57cf6..4a4e0248c 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantPageSaveablePart.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantPageSaveablePart.java
@@ -36,7 +36,7 @@ import org.eclipse.team.internal.ui.synchronize.*;
import org.eclipse.team.ui.SaveablePartAdapter;
import org.eclipse.team.ui.compare.*;
import org.eclipse.team.ui.mapping.ISynchronizationConstants;
-import org.eclipse.team.ui.operations.ResourceMappingSynchronizeParticipant;
+import org.eclipse.team.ui.operations.ModelSynchronizeParticipant;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.part.IPageBookViewPage;
@@ -45,7 +45,7 @@ import org.eclipse.ui.progress.IProgressService;
/**
* Displays a synchronize participant page combined with the compare/merge infrastructure. This only works if the
* synchronize page viewer provides selections that are of the following types: ITypedElement and ICompareInput
- * or if the participant is a {@link ResourceMappingSynchronizeParticipant}.
+ * or if the participant is a {@link ModelSynchronizeParticipant}.
*
* @since 3.0
*/
@@ -515,8 +515,8 @@ public class ParticipantPageSaveablePart extends SaveablePartAdapter implements
if(o instanceof ICompareInput) {
return (ICompareInput)o;
}
- if (participant instanceof ResourceMappingSynchronizeParticipant) {
- ResourceMappingSynchronizeParticipant msp = (ResourceMappingSynchronizeParticipant) participant;
+ if (participant instanceof ModelSynchronizeParticipant) {
+ ModelSynchronizeParticipant msp = (ModelSynchronizeParticipant) participant;
return msp.asCompareInput(o);
}
}
diff --git a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/mapping/ScopeBuildingTests.java b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/mapping/ScopeBuildingTests.java
index cfcfdc316..ad3bef9ae 100644
--- a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/mapping/ScopeBuildingTests.java
+++ b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/mapping/ScopeBuildingTests.java
@@ -26,14 +26,14 @@ import org.eclipse.team.core.mapping.IResourceMappingScope;
import org.eclipse.team.core.mapping.provider.ScopeGenerator;
import org.eclipse.team.internal.core.mapping.ResourceMappingScope;
import org.eclipse.team.tests.core.TeamTest;
-import org.eclipse.team.ui.operations.ResourceMappingOperation;
+import org.eclipse.team.ui.operations.ModelOperation;
public class ScopeBuildingTests extends TeamTest {
private static final RuntimeException PROMPT_EXCEPTION = new RuntimeException();
protected static final String TEST_MODEL_PROVIDER_ID = "id1";
- private class TestResourceMappingOperation extends ResourceMappingOperation {
+ private class TestResourceMappingOperation extends ModelOperation {
private ResourceMapping[] additionalMappings;
diff --git a/tests/org.eclipse.team.tests.cvs.core/launchConfigurations/One CVS Test.launch b/tests/org.eclipse.team.tests.cvs.core/launchConfigurations/One CVS Test.launch
index 81091145a..e19428941 100644
--- a/tests/org.eclipse.team.tests.cvs.core/launchConfigurations/One CVS Test.launch
+++ b/tests/org.eclipse.team.tests.cvs.core/launchConfigurations/One CVS Test.launch
@@ -12,11 +12,11 @@
<stringAttribute key="location" value="C:\Eclipse\Latest-Eclipse-Drop\eclipse\runtime-test-workspace"/>
<stringAttribute key="configLocation" value=""/>
<booleanAttribute key="clearws" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.team.tests.ccvs.core.provider.CVSProviderTest"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.team.tests.ccvs.core.subscriber.CVSCompareSubscriberTest"/>
<stringAttribute key="location1" value="C:\Eclipse\Latest-Eclipse-Drop\eclipse\runtime-test-workspace"/>
<stringAttribute key="pde.version" value="3.2"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os win32 -ws win32 -arch x86 -nl en_CA"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.cvs.properties=c:\eclipse\repository.properties -Declipse.cvs.testName=testUpdate123280"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.cvs.properties=c:\eclipse\repository.properties -Declipse.cvs.testName2=testInvalidTag"/>
<booleanAttribute key="default" value="true"/>
<booleanAttribute key="clearConfig" value="true"/>
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>

Back to the top