external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 12:18:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up some duplicated code.

Browse Source
This commit is contained in:
Myrd
2015-12-27 17:45:51 +00:00
parent 6a9d30e931
commit b5ebc9569d
1 changed files with 13 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
forge-gui-desktop/src/main/java/forge/view/arcane/CardArea.java
View File

@@ -24,9 +24,12 @@ import forge.view.arcane.util.CardPanelMouseListener;
import javax.swing.*; import javax.swing.*;
import com.google.common.collect.Lists;
import java.awt.*; import java.awt.*;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.util.List;
/** /**
* <p> * <p>
@@ -64,34 +67,17 @@ public class CardArea extends CardPanelContainer implements CardPanelMouseListen
@Override @Override
public final CardPanel getCardPanel(final int x, final int y) { public final CardPanel getCardPanel(final int x, final int y) {
if (this.isVertical) { final List<CardPanel> panels = isVertical ? Lists.reverse(getCardPanels()) : getCardPanels();
for (int i = this.getCardPanels().size() - 1; i >= 0; i--) { for (final CardPanel panel : panels) {
final CardPanel panel = this.getCardPanels().get(i); final int panelX = panel == this.getMouseDragPanel() ? this.mouseDragStartX : panel.getCardX();
final int panelX = panel == this.getMouseDragPanel() ? this.mouseDragStartX : panel.getCardX(); final int panelY = panel == this.getMouseDragPanel() ? this.mouseDragStartY : panel.getCardY();
final int panelY = panel == this.getMouseDragPanel() ? this.mouseDragStartY : panel.getCardY(); final int panelWidth = panel.getCardWidth();
final int panelWidth = panel.getCardWidth(); final int panelHeight = panel.getCardHeight();
final int panelHeight = panel.getCardHeight(); if ((x > panelX) && (x < (panelX + panelWidth)) && (y > panelY) && (y < (panelY + panelHeight))) {
if ((x > panelX) && (x < (panelX + panelWidth)) && (y > panelY) && (y < (panelY + panelHeight))) { if (!panel.isDisplayEnabled()) {
if (!panel.isDisplayEnabled()) { return null;
return null;
}
return panel;
}
}
}
else {
for (int i = 0, n = this.getCardPanels().size(); i < n; i++) {
final CardPanel panel = this.getCardPanels().get(i);
final int panelX = panel == this.getMouseDragPanel() ? this.mouseDragStartX : panel.getCardX();
final int panelY = panel == this.getMouseDragPanel() ? this.mouseDragStartY : panel.getCardY();
final int panelWidth = panel.getCardWidth();
final int panelHeight = panel.getCardHeight();
if ((x > panelX) && (x < (panelX + panelWidth)) && (y > panelY) && (y < (panelY + panelHeight))) {
if (!panel.isDisplayEnabled()) {
return null;
}
return panel;
} }
return panel;
} }
} }
return null; return null;