Skip to content

Set title to version control diff #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
albfan wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Set title to version control diff #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/org/jmeld/ui/JMeldPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jmeld/ui/NewPanelDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
10 changes: 9 additions & 1 deletion src/main/java/org/jmeld/util/file/VersionControlDiff.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public void diff()
false);
nodes = new HashMap<String, JMDiffNode>();

versionControlList = VersionControlUtil.getVersionControl(directory);
versionControlList = getAvailableVersionControlList();
if (versionControlList.isEmpty())
{
return;
Expand Down Expand Up @@ -147,6 +147,10 @@ public void diff()
StatusBar.getInstance().stop();
}

public List<VersionControlIF> getAvailableVersionControlList() {
return VersionControlUtil.getVersionControl(directory);
}

private JMDiffNode addNode(String name,
boolean leaf)
{
Expand Down Expand Up @@ -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;
}
}