Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2004-01-29 11:38:41 -0500
committerMichael Valenta2004-01-29 11:38:41 -0500
commit75ed2e664306836669593a1a89b003e4b7307bef (patch)
tree2ade4d09819f44b26fb3e6e45eca86ad4a180e73
parent4e985552ad532638b3d540ab1231124e06441a1f (diff)
downloadeclipse.platform.team-75ed2e664306836669593a1a89b003e4b7307bef.tar.gz
eclipse.platform.team-75ed2e664306836669593a1a89b003e4b7307bef.tar.xz
eclipse.platform.team-75ed2e664306836669593a1a89b003e4b7307bef.zip
*** empty log message ***
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/BackgroundEventHandler.java23
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/messages.properties4
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberEventHandler.java18
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/DeferredResourceChangeHandler.java18
-rw-r--r--bundles/org.eclipse.team.ui/plugin.properties4
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties4
6 files changed, 20 insertions, 51 deletions
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/BackgroundEventHandler.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/BackgroundEventHandler.java
index 751ca782f..f1827a795 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/BackgroundEventHandler.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/BackgroundEventHandler.java
@@ -51,6 +51,8 @@ public abstract class BackgroundEventHandler {
// time to wait for messages to be queued
private long WAIT_DELAY = 1000;
+
+ private String jobName;
/**
* Resource event class. The type is specific to subclasses.
@@ -100,10 +102,11 @@ public abstract class BackgroundEventHandler {
}
}
- protected BackgroundEventHandler() {
+ protected BackgroundEventHandler(String jobName, String errorTitle) {
+ this.jobName = jobName;
errors =
new ExceptionCollector(
- getErrorsTitle(),
+ errorTitle,
TeamPlugin.ID,
IStatus.ERROR,
null /* don't log */
@@ -161,18 +164,6 @@ public abstract class BackgroundEventHandler {
}
/**
- * Return the name of the handler, which is used as the job name.
- * @return the name of the handler
- */
- public abstract String getName();
-
- /**
- * Return the text to be displayed as the title for any errors that occur.
- * @return the title to display in an error message
- */
- protected abstract String getErrorsTitle();
-
- /**
* Shutdown the event handler. Any events on the queue will be removed from the queue
* and will not be processed.
*/
@@ -206,6 +197,10 @@ public abstract class BackgroundEventHandler {
}
}
+ protected String getName() {
+ return jobName;
+ }
+
/**
* Get the next resource to be calculated.
* @return Event to be processed
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/messages.properties b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/messages.properties
index 4dc695713..320e620b5 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/messages.properties
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/messages.properties
@@ -105,3 +105,7 @@ TeamProvider.10=Error restoring subscribers. Cannot find factory with id: {0}
TeamProvider.11=Error saving subscribers. Cannot find factory with id: {0}
ContentComparisonCriteria.2=Comparing content {0}
ContentComparisonCriteria.3=\ ignoring whitespace
+
+SubscriberEventHandler.2=Calculating synchronization state for {0}.
+SubscriberEventHandler.jobName=Updating synchronization states for {0}.
+SubscriberEventHandler.errors=Errors have occured while calculating the synchronization state for {0}.
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberEventHandler.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberEventHandler.java
index bcc1cbe63..6ed1bb05f 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberEventHandler.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberEventHandler.java
@@ -79,6 +79,9 @@ public class SubscriberEventHandler extends BackgroundEventHandler {
* @param set the subscriber set to feed changes into
*/
public SubscriberEventHandler(SyncSetInputFromSubscriber set) {
+ super(
+ Policy.bind("SubscriberEventHandler.jobName", set.getSubscriber().getDescription()), //$NON-NLS-1$
+ Policy.bind("SubscriberEventHandler.errors", set.getSubscriber().getDescription())); //$NON-NLS-1$
this.set = set;
reset(set.getSubscriber().roots(), SubscriberEvent.INITIALIZE);
}
@@ -250,21 +253,6 @@ public class SubscriberEventHandler extends BackgroundEventHandler {
}
}
-
- /* (non-Javadoc)
- * @see org.eclipse.team.core.subscribers.BackgroundEventHandler#getName()
- */
- public String getName() {
- return Policy.bind("SubscriberEventHandler.jobName"); //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.team.core.subscribers.BackgroundEventHandler#getErrorsTitle()
- */
- public String getErrorsTitle() {
- return Policy.bind("SubscriberEventHandler.errors"); //$NON-NLS-1$;
- }
-
/* (non-Javadoc)
* @see org.eclipse.team.core.subscribers.BackgroundEventHandler#processEvent(org.eclipse.team.core.subscribers.BackgroundEventHandler.Event, org.eclipse.core.runtime.IProgressMonitor)
*/
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/DeferredResourceChangeHandler.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/DeferredResourceChangeHandler.java
index 59d40773c..5036abceb 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/DeferredResourceChangeHandler.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/DeferredResourceChangeHandler.java
@@ -25,25 +25,15 @@ import org.eclipse.team.internal.ccvs.core.resources.EclipseSynchronizer;
*/
public class DeferredResourceChangeHandler extends BackgroundEventHandler {
+ public DeferredResourceChangeHandler() {
+ super(Policy.bind("DeferredResourceChangeHandler.0"), Policy.bind("DeferredResourceChangeHandler.1")); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
private static final int IGNORE_FILE_CHANGED = 1;
private Set changedIgnoreFiles = new HashSet();
/* (non-Javadoc)
- * @see org.eclipse.team.core.subscribers.BackgroundEventHandler#getName()
- */
- public String getName() {
- return Policy.bind("DeferredResourceChangeHandler.0"); //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.team.core.subscribers.BackgroundEventHandler#getErrorsTitle()
- */
- public String getErrorsTitle() {
- return Policy.bind("DeferredResourceChangeHandler.1"); //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
* @see org.eclipse.team.core.subscribers.BackgroundEventHandler#processEvent(org.eclipse.team.core.subscribers.BackgroundEventHandler.Event, org.eclipse.core.runtime.IProgressMonitor)
*/
protected void processEvent(Event event, IProgressMonitor monitor) throws TeamException {
diff --git a/bundles/org.eclipse.team.ui/plugin.properties b/bundles/org.eclipse.team.ui/plugin.properties
index 2575cafb7..cb76d2eca 100644
--- a/bundles/org.eclipse.team.ui/plugin.properties
+++ b/bundles/org.eclipse.team.ui/plugin.properties
@@ -13,15 +13,12 @@ pluginName=Team Support UI
Team=Team
configurationWizards=Configuration Wizards
-targetWizards=Target Site Addition Wizards
synchronizeParticipants=Synchronize View Participants
logicalViews=Logical Synchronize Views
TeamPreferencePage.name=Team
TextPreferencePage.name=File Content
IgnorePreferencePage.name=Ignored Resources
-loginDetails=Login Details
-targetSite=Target Site
ConfigureProject.label=&Share Project...
ConfigureProject.tooltip=Share the project with others using a version and configuration management system.
@@ -31,7 +28,6 @@ Team.viewCategory=Team
Synchronizing.perspective=Team Synchronizing
SyncView.name=Synchronize
-OldSyncView.name=Old Synchronize
ProjectSetImportWizard.name=Team Project Set
ProjectSetImportWizard.description=A wizard that imports a Team Project Set
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties
index 140047886..675da94f6 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties
@@ -90,9 +90,6 @@ LiveSyncView.titleTooltip=Working Set: {0}
LiveSyncView.title=Synchronize
LiveSyncView.titleSubscriber=Synchronize - {0}
-SubscriberEventHandler.jobName=Updating synchronization states in the Synchronize view.
-SubscriberEventHandler.errors=Errors have occured while calculating the synchronization state. The Synchronize View may be out-of-date. Refresh the view or fix the errors and re-run the Synchronize command.
-
SyncInfoCompareInput.localLabel=Local File
SyncInfoCompareInput.localLabelExists=Local File ({0})
SyncInfoCompareInput.remoteLabel=Remote File
@@ -311,7 +308,6 @@ CopyAction.errorMessage=There was a problem when accessing the system clipboard.
PasteAction.title=&Paste
PasteAction.toolTip=Paste
RefactorActionGroup.0=Edi&t
-SubscriberEventHandler.2=Calculating state for {0}.
SynchronizeManager.7=Error notifying of added/removal of synchronize participants
SynchronizeManager.8=Error initializing participants
SynchronizeManager.9=Synchronize participant with id {0} is not in the registry

Back to the top