Latest history view changesI20060116a

8 files changed, 42 insertions, 33 deletions

diff --git a/bundles/org.eclipse.team.ui/plugin.properties b/bundles/org.eclipse.team.ui/plugin.properties
index 8c3c3a69c..a6210c2ae 100644
--- a/bundles/org.eclipse.team.ui/plugin.properties
+++ b/bundles/org.eclipse.team.ui/plugin.properties
@@ -57,3 +57,5 @@ CompressFolderView.description=Compress in-sync folders paths
 
 FileRevision.OpenAction.name=&Open Revision
 FileRevision.Compare.name=&Compare
+
+ShowLocalHistory.label=&Show Local History
diff --git a/bundles/org.eclipse.team.ui/plugin.xml b/bundles/org.eclipse.team.ui/plugin.xml
index 5e4a356b0..6462c3868 100644
--- a/bundles/org.eclipse.team.ui/plugin.xml
+++ b/bundles/org.eclipse.team.ui/plugin.xml
@@ -123,7 +123,7 @@
                class="org.eclipse.team.internal.ui.history.ShowLocalHistory"
                enablesFor="1"
                id="org.eclipse.team.ui.showlocalhistory"
-               label="&Show Local History"
+               label="%ShowLocalHistory.label"
                menubarPath="local"/>
       </objectContribution>
    </extension>
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIMessages.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIMessages.java
index efae8918f..60838714e 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIMessages.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIMessages.java
@@ -369,4 +369,10 @@ public class TeamUIMessages extends NLS {
 
 	public static String GenericHistoryView_0;
 
+	public static String LocalHistoryTableProvider_localRevision;
+
+	public static String LocalHistoryPage_openRevision;
+
+	public static String LocalHistoryPage_fetchingLocalHistory;
+
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/FileRevisionEditorInput.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/FileRevisionEditorInput.java
index dec018d0e..37b87b3fa 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/FileRevisionEditorInput.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/FileRevisionEditorInput.java
@@ -58,9 +58,9 @@ public class FileRevisionEditorInput implements IWorkbenchAdapter,IStorageEditor
 			return NLS.bind(TeamUIMessages.nameAndRevision, new String[] { file.getName(), file.getContentIdentifier()});
 		
 		if (storage != null){
-			return storage.getName() +  " " + DateFormat.getInstance().format(new Date(((IFileState) storage).getModificationTime())) ;
+			return storage.getName() +  " " + DateFormat.getInstance().format(new Date(((IFileState) storage).getModificationTime())) ; //$NON-NLS-1$
 		}
-		return "";
+		return ""; //$NON-NLS-1$
 		
 	}
 
@@ -73,7 +73,7 @@ public class FileRevisionEditorInput implements IWorkbenchAdapter,IStorageEditor
 		if (file != null)
 			return file.getContentIdentifier();
 		
-		return "";
+		return ""; //$NON-NLS-1$
 	}
 
 	public Object getAdapter(Class adapter) {
@@ -99,7 +99,7 @@ public class FileRevisionEditorInput implements IWorkbenchAdapter,IStorageEditor
 		if (storage != null){
 			return storage.getName();
 		}
-		return "";
+		return ""; //$NON-NLS-1$
 	}
 
 	public Object getParent(Object o) {
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/LocalHistoryPage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/LocalHistoryPage.java
index adc715160..4ca0ce2cf 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/LocalHistoryPage.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/LocalHistoryPage.java
@@ -40,7 +40,7 @@ public class LocalHistoryPage extends Page implements IHistoryPage {
 	
 	private IViewSite parentSite;
 	private OpenLocalFileAction openAction;
-	private CompareLocalFileAction compareAction;
+	//private CompareLocalFileAction compareAction;
 
 	
 	public void showHistory(IResource resource, boolean refetch) {
@@ -85,7 +85,7 @@ public class LocalHistoryPage extends Page implements IHistoryPage {
 
 	private void contributeActions() {
 		// Double click open action
-		openAction = new OpenLocalFileAction("Open Local File");
+		openAction = new OpenLocalFileAction(TeamUIMessages.LocalHistoryPage_openRevision);
 		tableViewer.getTable().addListener(SWT.DefaultSelection, new Listener() {
 			public void handleEvent(Event e) {
 				openAction.selectionChanged((IStructuredSelection) tableViewer.getSelection());
@@ -93,7 +93,7 @@ public class LocalHistoryPage extends Page implements IHistoryPage {
 			}
 		});
 		
-		compareAction = new CompareLocalFileAction("Compare File");
+		//compareAction = new CompareLocalFileAction("Compare");
 		
 		//Contribute actions to popup menu
 		MenuManager menuMgr = new MenuManager();
@@ -115,9 +115,9 @@ public class LocalHistoryPage extends Page implements IHistoryPage {
 			IStructuredSelection selection = (IStructuredSelection) tableViewer.getSelection();
 		    openAction.selectionChanged(selection);
 		    menuMgr.add(openAction);
-		    compareAction.setEnabled(selection.size() == 2);
+		    /*compareAction.setEnabled(selection.size() == 2);
 		    compareAction.selectionChanged(selection);
-		    menuMgr.add(compareAction);
+		    menuMgr.add(compareAction);*/
 		    menuMgr.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
 	}
 	
@@ -189,7 +189,7 @@ public class LocalHistoryPage extends Page implements IHistoryPage {
 		public IFile localFile;
 
 		public FetchLocalHistoryJob() {
-			super("Fetching Local History");
+			super(TeamUIMessages.LocalHistoryPage_fetchingLocalHistory);
 		}
 
 		public IFile getFile() {
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/LocalHistoryTableProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/LocalHistoryTableProvider.java
index 1f8c1e380..4b981f9dc 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/LocalHistoryTableProvider.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/LocalHistoryTableProvider.java
@@ -42,10 +42,10 @@ public class LocalHistoryTableProvider {
 					String revision = DateFormat.getInstance().format(new Date(entry.getModificationTime()));
 					return revision;
 				case COL_AUTHOR:
-					return "local user";
+					return ""; //$NON-NLS-1$
 					
 				case COL_COMMENT:
-					return "local revision";
+					return TeamUIMessages.LocalHistoryTableProvider_localRevision;
 			}
 			return ""; //$NON-NLS-1$
 		}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/OpenLocalFileAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/OpenLocalFileAction.java
index 32adc6454..55a14fab3 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/OpenLocalFileAction.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/OpenLocalFileAction.java
@@ -23,7 +23,7 @@ import org.eclipse.team.internal.ui.TeamUIPlugin;
 import org.eclipse.ui.*;
 import org.eclipse.ui.actions.BaseSelectionListenerAction;
 
-public class OpenLocalFileAction extends BaseSelectionListenerAction  {
+public class OpenLocalFileAction extends BaseSelectionListenerAction {
 
 	protected OpenLocalFileAction(String text) {
 		super(text);
@@ -31,33 +31,32 @@ public class OpenLocalFileAction extends BaseSelectionListenerAction  {
 
 	public void run() {
 		try {
-					IStructuredSelection structSel = getStructuredSelection();
+			IStructuredSelection structSel = getStructuredSelection();
 
-					Object[] objArray = structSel.toArray();
-
-					for (int i = 0; i < objArray.length; i++) {
-						IFileState state = (IFileState) objArray[i];
-						if (!state.exists()) {
-							MessageDialog.openError(TeamUIPlugin.getActivePage().getActivePart().getSite().getShell(), TeamUIMessages.OpenRevisionAction_DeletedRevisionTitle, TeamUIMessages.OpenRevisionAction_DeletedRevisionMessage);
-						} else {
-							String id = getEditorID(state.getName(), state.getContents());
-							IWorkbenchPage page = TeamUIPlugin.getActivePage();
-							if (page != null){
-								page.openEditor(new FileRevisionEditorInput(state), id);
-							}
-						}
+			Object[] objArray = structSel.toArray();
 
+			for (int i = 0; i < objArray.length; i++) {
+				IFileState state = (IFileState) objArray[i];
+				if (!state.exists()) {
+					MessageDialog.openError(TeamUIPlugin.getActivePage().getActivePart().getSite().getShell(), TeamUIMessages.OpenRevisionAction_DeletedRevisionTitle, TeamUIMessages.OpenRevisionAction_DeletedRevisionMessage);
+				} else {
+					String id = getEditorID(state.getName(), state.getContents());
+					IWorkbenchPage page = TeamUIPlugin.getActivePage();
+					if (page != null) {
+						page.openEditor(new FileRevisionEditorInput(state), id);
 					}
-
-				} catch (Exception e) {
-				
 				}
+
+			}
+
+		} catch (Exception e) {
+
+		}
 	}
 
 	/* private */String getEditorID(String fileName, InputStream contents) {
 		IWorkbench workbench = TeamUIPlugin.getPlugin().getWorkbench();
 		IEditorRegistry registry = workbench.getEditorRegistry();
-		IWorkbenchPage page = workbench.getActiveWorkbenchWindow().getActivePage();
 
 		IContentType type = null;
 		if (contents != null) {
@@ -80,6 +79,5 @@ public class OpenLocalFileAction extends BaseSelectionListenerAction  {
 
 		return id;
 	}
-	
 
 }
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 2afb477f2..b7095a3bf 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
@@ -364,3 +364,6 @@ TextAutoMerge_inputEncodingError= Unsupported encoding for input stream
 TextAutoMerge_outputEncodingError= Unsupported encoding for output stream
 TextAutoMerge_outputIOError= I/O error on writing
 TextAutoMerge_conflict= Conflict: cannot auto-merge
+LocalHistoryTableProvider_localRevision=<local revision>
+LocalHistoryPage_openRevision=Open Revision
+LocalHistoryPage_fetchingLocalHistory=Fetching Local History