Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Michel-Lemieux2003-09-11 16:46:57 -0400
committerJean Michel-Lemieux2003-09-11 16:46:57 -0400
commite6a3bb688f4ed98557bf5a41703ae0431a9405dd (patch)
treeb5bfbd05a69004d497a06150b5ae6b0eabdc4283
parent5b05399491beba402ee6950b8a63465434a422d1 (diff)
downloadeclipse.platform.team-e6a3bb688f4ed98557bf5a41703ae0431a9405dd.tar.gz
eclipse.platform.team-e6a3bb688f4ed98557bf5a41703ae0431a9405dd.tar.xz
eclipse.platform.team-e6a3bb688f4ed98557bf5a41703ae0431a9405dd.zip
Bug 39145 [live sync view] revision # not shown in compare editor
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties1
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/compare/SyncInfoCompareInput.java9
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/compare/SyncInfoCompareInputFinder.java71
3 files changed, 7 insertions, 74 deletions
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 a5ac03c51..824cb9125 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
@@ -104,6 +104,7 @@ SubscriberEventHandler.jobName=Updating synchronization state
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
SyncInfoCompareInput.baseLabel=Common Ancestor
SyncInfoCompareInput.remoteLabelExists=Remote File ({0} {1} {2})
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/compare/SyncInfoCompareInput.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/compare/SyncInfoCompareInput.java
index 7bd58b22e..d1b033b61 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/compare/SyncInfoCompareInput.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/compare/SyncInfoCompareInput.java
@@ -97,7 +97,12 @@ public class SyncInfoCompareInput extends CompareEditorInput {
IRemoteResource remote = sync.getRemote();
IRemoteResource base = sync.getBase();
- config.setLeftLabel(Policy.bind("SyncInfoCompareInput.localLabel")); //$NON-NLS-1$
+ String localContentId = sync.getLocalContentIdentifier();
+ if(localContentId != null) {
+ config.setLeftLabel(Policy.bind("SyncInfoCompareInput.localLabelExists", localContentId)); //$NON-NLS-1$
+ } else {
+ config.setLeftLabel(Policy.bind("SyncInfoCompareInput.localLabel")); //$NON-NLS-1$
+ }
if(remote != null) {
try {
@@ -163,8 +168,6 @@ public class SyncInfoCompareInput extends CompareEditorInput {
if(other == this) return true;
if(other instanceof SyncInfoCompareInput) {
return equalDiffNodes(node, (SyncInfoDiffNode)((SyncInfoCompareInput)other).getCompareResult());
- } else if(other instanceof SyncInfoCompareInputFinder) {
- return true;
}
return false;
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/compare/SyncInfoCompareInputFinder.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/compare/SyncInfoCompareInputFinder.java
deleted file mode 100644
index 5f88d1eb3..000000000
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/compare/SyncInfoCompareInputFinder.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.team.internal.ui.sync.compare;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IPersistableElement;
-
-
-/**
- * SyncInfoCompareInputFinder
- */
-public class SyncInfoCompareInputFinder implements IEditorInput {
-
- public boolean equals(Object other) {
- if(other instanceof SyncInfoCompareInput) {
- return true;
- }
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IEditorInput#exists()
- */
- public boolean exists() {
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IEditorInput#getImageDescriptor()
- */
- public ImageDescriptor getImageDescriptor() {
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IEditorInput#getName()
- */
- public String getName() {
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IEditorInput#getPersistable()
- */
- public IPersistableElement getPersistable() {
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IEditorInput#getToolTipText()
- */
- public String getToolTipText() {
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
- */
- public Object getAdapter(Class adapter) {
- return null;
- }
-} \ No newline at end of file

Back to the top