Merge branch 'nb82'

Author: junichi11

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.junichi11</groupId>
     <artifactId>netbeans-github-issues</artifactId>
-    <version>0.3.1</version>
+    <version>0.3.2</version>
     <packaging>nbm</packaging>
     <build>
         <plugins>

src/main/java/com/junichi11/netbeans/modules/github/issues/issue/ui/FileChangedPanel.java

@@ -227,8 +227,8 @@ public void run() {
                         String mimeType = getMimeType(filename);
 
                         String prSha = file.getSha();
-                        StreamSource prSource = StreamSource.createSource(filename, prSha, mimeType, prReader); // NOI18N
-                        StreamSource baseSource = StreamSource.createSource(filename, baseSha, mimeType, baseReader); // NOI18N
+                        StreamSource prSource = StreamSource.createSource(filename, prSha, mimeType, prReader);
+                        StreamSource baseSource = StreamSource.createSource(filename, baseSha, mimeType, baseReader);
                         final DiffView view = Diff.getDefault().createDiff(baseSource, prSource);
                         SwingUtilities.invokeLater(new Runnable() {
                             @Override

src/main/java/com/junichi11/netbeans/modules/github/issues/issue/ui/GitHubIssuePanel.java

@@ -439,13 +439,15 @@ public void update() {
                     List<CommitFile> pullRequestsFiles = repository.getPullRequestsFiles(issue.getNumber());
                     filesChangedPanel.setDisplayName(String.format("[Diff] #%s - %s", id, summary)); // NOI18N
                     filesChangedPanel.removeAllFiles();
-                    String hostname = repository.getHostname();
-                    for (CommitFile file : pullRequestsFiles) {
-                        if (hostname.equals(GitHubIssues.DEFAULT_HOSTNAME)) {
-                            hostname = IGitHubConstants.HOST_DEFAULT;
-                        }
-                        filesChangedPanel.addFile(file, base, hostname);
-                    }
+                    // #51 disable each file diff
+                    // FIXME if we can get exact sha ids, this can be enabled again
+//                    String hostname = repository.getHostname();
+//                    for (CommitFile file : pullRequestsFiles) {
+//                        if (hostname.equals(GitHubIssues.DEFAULT_HOSTNAME)) {
+//                            hostname = IGitHubConstants.HOST_DEFAULT;
+//                        }
+//                        filesChangedPanel.addFile(file, base, hostname);
+//                    }
                     filesChangedPanel.setDetails(pullRequest);
                     filesChangedcollapsibleSectionPanel.setLabel(Bundle.GitHubIssuePanel_files_changed_count(pullRequestsFiles.size()));
 

src/main/java/com/junichi11/netbeans/modules/github/issues/repository/GitHubRepository.java

@@ -43,6 +43,7 @@
 
 import com.junichi11.netbeans.modules.github.issues.GitHubCache;
 import com.junichi11.netbeans.modules.github.issues.GitHubIcons;
+import com.junichi11.netbeans.modules.github.issues.GitHubIssues;
 import com.junichi11.netbeans.modules.github.issues.GitHubIssuesConfig;
 import com.junichi11.netbeans.modules.github.issues.GitHubIssuesConnector;
 import com.junichi11.netbeans.modules.github.issues.egit.SearchIssuesParams;
@@ -83,6 +84,7 @@
 import org.eclipse.egit.github.core.RepositoryCommitCompare;
 import org.eclipse.egit.github.core.User;
 import org.eclipse.egit.github.core.client.GitHubClient;
+import org.eclipse.egit.github.core.client.IGitHubConstants;
 import org.eclipse.egit.github.core.service.CollaboratorService;
 import org.eclipse.egit.github.core.service.CommitService;
 import org.eclipse.egit.github.core.service.IssueService;
@@ -1005,7 +1007,11 @@ public Repository getRepository() {
     }
 
     public void setRepositoryInfo(GitHubRepositoryInfo githubRepositoryInfo) {
-        String url = String.format("https://%s/%s/%s/issues/", githubRepositoryInfo.getHostname(), githubRepositoryInfo.getRepositoryAuthor(), githubRepositoryInfo.getRepositoryName()); // NOI18N
+        String hostname = githubRepositoryInfo.getHostname();
+        if (hostname.equals(GitHubIssues.DEFAULT_HOSTNAME)) {
+            hostname = IGitHubConstants.HOST_DEFAULT;
+        }
+        String url = String.format("https://%s/%s/%s/issues/", hostname, githubRepositoryInfo.getRepositoryAuthor(), githubRepositoryInfo.getRepositoryName()); // NOI18N
         repositoryInfo = createRepositoryInfo(githubRepositoryInfo, url, githubRepositoryInfo.getUserName(), null, null, null);
         setProperties(githubRepositoryInfo);
     }