Skip to content

FIX #19 Cannot delete Index #20

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
mathieu-lavigne wants to merge 1 commit into
base: master
Choose a base branch
from
Open

FIX #19 Cannot delete Index #20

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
17 changes: 16 additions & 1 deletion src/main/java/ca/sqlpower/architect/swingui/action/DeleteSelectedAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@

import javax.swing.JOptionPane;
import javax.swing.KeyStroke;
import javax.swing.tree.TreePath;

import org.apache.log4j.Logger;

Expand Down Expand Up @@ -86,7 +87,9 @@ public void actionPerformed(ActionEvent evt) {
logger.debug("delete action detected!"); //$NON-NLS-1$
logger.debug("ACTION COMMAND: " + evt.getActionCommand()); //$NON-NLS-1$

if (getPlaypen().getSelectedItems().size() < 1) {
final TreePath[] selectionPaths = getSession().getDBTree().getSelectionPaths();
final int selectionPathsSize = selectionPaths != null ? selectionPaths.length : 0;
if (getPlaypen().getSelectedItems().size() + selectionPathsSize < 1) {
JOptionPane.showMessageDialog(getPlaypen(), Messages.getString("DeleteSelectedAction.noItemsToDelete")); //$NON-NLS-1$
return;
}
Expand Down Expand Up @@ -218,6 +221,18 @@ List<SPObject> retrieveDeletableItems() {
}
}

// Invisible elements in the PlayPen but selected in the TreeView
TreePath[] selectionPaths = getSession().getDBTree().getSelectionPaths();
if (selectionPaths != null) {
for (final TreePath tp : selectionPaths) {
final Object c = tp.getLastPathComponent();
if (c instanceof SQLIndex && !deleteItems.contains(c)) {
final SQLIndex index = (SQLIndex) c;
deleteItems.add(index);
}
}
}

Set<SQLTable> tablesWithSelectedColumns = new HashSet<SQLTable>();

for (ListIterator<SPObject> it = deleteItems.listIterator(); it.hasNext(); ) {
Expand Down