Skip to content

Start version control diff from D&D #7

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 2 commits into
base: master
Choose a base branch
from
Open

Start version control diff from D&D #7

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5038f1
Start version control diff from D&D
albfan Mar 9, 2025
cfee554
Clean dnd files on each usage
albfan Mar 9, 2025
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
49 changes: 31 additions & 18 deletions src/main/java/org/jmeld/ui/dnd/DragAndDropPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,12 @@
public class DragAndDropPanel
extends JPanel
{
public static Color DND_SELECTED_NOT_USED = ColorUtil.brighter(Color.LIGHT_GRAY);

private JComponent leftDragAndDropArea;
private JComponent rightDragAndDropArea;
private String leftFileName = "";
private String rightFileName = "";
private String leftFileName;
private String rightFileName;

public DragAndDropPanel()
{
Expand All @@ -63,6 +65,14 @@ public DragAndDropPanel()

addHierarchyListener(getHierarchyListener());
addMouseListener(getMouseListener());
cleanFiles();
}

private void cleanFiles() {
leftFileName = "";
rightFileName = "";
leftDragAndDropArea.setBackground(DND_SELECTED_NOT_USED);
rightDragAndDropArea.setBackground(DND_SELECTED_NOT_USED);
}

private HierarchyListener getHierarchyListener()
Expand Down Expand Up @@ -251,7 +261,7 @@ private JComponent createDragAndDropArea()
p = new JPanel();
p.setOpaque(true);
p.setBorder(BorderFactory.createLineBorder(Color.LIGHT_GRAY));
p.setBackground(ColorUtil.brighter(Color.LIGHT_GRAY));
p.setBackground(DND_SELECTED_NOT_USED);
p.setPreferredSize(new Dimension(20,
0));

Expand All @@ -264,24 +274,27 @@ private MouseListener getMouseListener()
{
public void mousePressed(MouseEvent me)
{
if (StringUtil.isEmpty(leftFileName) || StringUtil.isEmpty(rightFileName))
{
return;
}

if (leftFileName.equals(rightFileName))
try
{
return;
}
if (StringUtil.isEmpty(leftFileName))
{
return;
}

leftDragAndDropArea.setBackground(Colors.DND_SELECTED_USED);
rightDragAndDropArea.setBackground(Colors.DND_SELECTED_USED);
String leftPath = new File(new URL(leftFileName).toURI()).getAbsolutePath();
leftDragAndDropArea.setBackground(Colors.DND_SELECTED_USED);

try
{
JMeld.getJMeldPanel().openComparison(new File(new URL(leftFileName).toURI()).getAbsolutePath(),
new File(new URL(rightFileName).toURI()).getAbsolutePath(),
null);
String rightPath = "";
if (!StringUtil.isEmpty(rightFileName)) {
if (leftFileName.equals(rightFileName))
{
return;
}
rightPath = new File(new URL(rightFileName).toURI()).getAbsolutePath();
rightDragAndDropArea.setBackground(Colors.DND_SELECTED_USED);
}
cleanFiles();
JMeld.getJMeldPanel().openComparison(leftPath, rightPath, null);
}
catch (Exception ex)
{
Expand Down