Changeset 3:296778dfdf6d for com.goldenhammers.merclipse/src/com/goldenhammers/merclipse/history/MercurialHistoryPage.java

Timestamp:

10/19/08 22:24:45 (4 years ago)

Author:

Whitney Sorenson <ws@…>

Branch:

default

Message:

0.8.7 - add support for log on repo, dont block ui thread on history

Files:

• com.goldenhammers.merclipse/src/com/goldenhammers/merclipse/history/MercurialHistoryPage.java (modified) (8 diffs)

com.goldenhammers.merclipse/src/com/goldenhammers/merclipse/history/MercurialHistoryPage.java

@@ -14 +14 @@
 
 import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.IPath;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IAction;
@@ -81 +83 @@
                         @Override
                         public void run() {
-                                IFile file = getCurrentFile();
+                                IFile file = (IFile) getCurrentResource();
                                 
                                 MercurialWorkingDir workingDir = MercurialUtils.getWorkingDirectory(file);
@@ -133 +135 @@
                                 if (newInput != null) {
                                         // TODO what if the files are commited? we need a new pull here.
-                                        mfh = new MercurialFileHistory(getCurrentFile());
+                                        IResource currentResource = getCurrentResource();
+                                        
+                                        if (currentResource.getType() == IResource.FILE) {
+                                                mfh = new MercurialFileHistory((IFile) currentResource);
+                                        } else {
+                                                mfh = new MercurialFileHistory(MercurialUtils.getWorkingDirectory(currentResource));
+                                        }                                       
                                 } else {
                                         mfh = null;
@@ -162 +170 @@
         
         private void fillTableMenu(IMenuManager menuMgr) {
+                if (getCurrentResource().getType() == IResource.PROJECT) {
+                        return;
+                }
+                
                 ISelection sel = tableViewer.getSelection();
                 StructuredSelection structuredSel = (StructuredSelection) sel;
@@ -184 +196 @@
                 return container;
         }
-        
-        protected IFile getCurrentFile() {
-                return (IFile) getInput();
+                
+        protected IResource getCurrentResource() {
+                return (IResource) getInput();
         }
 
@@ -194 +206 @@
 
         public String getDescription() {
+                IPath location = getCurrentResource().getLocation();
+                
+                if (location != null) {
+                        return location.toString();
+                }
+                
                 return getName();
         }
 
         public String getName() {
-                return getCurrentFile().getName();
+                return getCurrentResource().getName();
         }
 
@@ -223 +241 @@
                 
                 if (isValidInput(input)) {
-                        currentRevision = new LocalFileRevision(getCurrentFile());
-                        tableViewer.setInput(getCurrentFile());
+                        if (getCurrentResource().getType() == IResource.FILE) {
+                                currentRevision = new LocalFileRevision((IFile) getCurrentResource());
+                        } else {
+                                currentRevision = null;
+                        }
+                        tableViewer.setInput(getCurrentResource());
                         return true;
                 }
@@ -232 +254 @@
         
         public boolean isValidInput(Object object) {
-                return object instanceof IFile;
+                return object instanceof IFile || object instanceof IProject;
         }