diff --git a/src/main/java/org/jmeld/ui/JMeldPanel.java b/src/main/java/org/jmeld/ui/JMeldPanel.java index e1c6f9ab..39be63cf 100644 --- a/src/main/java/org/jmeld/ui/JMeldPanel.java +++ b/src/main/java/org/jmeld/ui/JMeldPanel.java @@ -1360,7 +1360,7 @@ protected void done() diff); panel.setId(contentId); - tabbedPane.addTab("TODO: Think of title!", + tabbedPane.addTab( diff.getAvailableVersionControlList().get(0).getName()+"-"+diff.getDirectory().getAbsolutePath(), Icons.FOLDER.getSmallIcon(), panel); tabbedPane.setSelectedComponent(panel); diff --git a/src/main/java/org/jmeld/ui/NewPanelDialog.java b/src/main/java/org/jmeld/ui/NewPanelDialog.java index 0a263cf1..e1d4934a 100644 --- a/src/main/java/org/jmeld/ui/NewPanelDialog.java +++ b/src/main/java/org/jmeld/ui/NewPanelDialog.java @@ -183,7 +183,7 @@ private JComponent getChooseFilePanel() getFileComparisonPanel()); tabbedPane.add("Directory Comparison", getDirectoryComparisonPanel()); - //tabbedPane.add("Version control", getVersionControlPanel()); + tabbedPane.add("Version control", getVersionControlPanel()); new TabbedPanePreference("NewPanelTabbedPane", tabbedPane); diff --git a/src/main/java/org/jmeld/util/file/VersionControlDiff.java b/src/main/java/org/jmeld/util/file/VersionControlDiff.java index a53d9855..4e459d57 100644 --- a/src/main/java/org/jmeld/util/file/VersionControlDiff.java +++ b/src/main/java/org/jmeld/util/file/VersionControlDiff.java @@ -92,7 +92,7 @@ public void diff() false); nodes = new HashMap(); - versionControlList = VersionControlUtil.getVersionControl(directory); + versionControlList = getAvailableVersionControlList(); if (versionControlList.isEmpty()) { return; @@ -147,6 +147,10 @@ public void diff() StatusBar.getInstance().stop(); } + public List getAvailableVersionControlList() { + return VersionControlUtil.getVersionControl(directory); + } + private JMDiffNode addNode(String name, boolean leaf) { @@ -214,4 +218,8 @@ public static void main(String[] args) System.out.println("diff took " + stopWatch.getElapsedTime() + " msec."); diff.print(); } + + public File getDirectory() { + return directory; + } }