MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

SVN: one-click merge: remove pages concept

Browse Source 
(cherry picked from commit ca2fe75505216750f3dad0bf0ba7271f80cb3f15)
This commit is contained in:
irengrig
2010-07-14 15:59:25 +04:00
parent bd123b0e22
commit 3ecc391490
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/PagedListWithActions.java
+2 -3
View File
@@ -71,15 +71,13 @@ public class PagedListWithActions<T> {
final List<T> data = myEngine.next(); final List<T> data = myEngine.next();
myComponentManager.setData(data); myComponentManager.setData(data);
myComponentManager.refresh(); myComponentManager.refresh();
/*myList.setListData(ArrayUtil.toObjectArray(data));
myList.revalidate();
myList.repaint();*/
} }
@Override @Override
public void update(AnActionEvent e) { public void update(AnActionEvent e) {
super.update(e); super.update(e);
e.getPresentation().setEnabled(myEngine.hasNext()); e.getPresentation().setEnabled(myEngine.hasNext());
e.getPresentation().setVisible(myEngine.hasNext());
} }
} }
@@ -99,6 +97,7 @@ public class PagedListWithActions<T> {
public void update(AnActionEvent e) { public void update(AnActionEvent e) {
super.update(e); super.update(e);
e.getPresentation().setEnabled(myEngine.hasPrevious()); e.getPresentation().setEnabled(myEngine.hasPrevious());
e.getPresentation().setVisible(myEngine.hasPrevious());
} }
} }
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/ToBeMergedDialog.java
+6 -4
View File
@@ -15,9 +15,9 @@
*/ */
package org.jetbrains.idea.svn.dialogs; package org.jetbrains.idea.svn.dialogs;
import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.CommonShortcuts; import com.intellij.openapi.actionSystem.CommonShortcuts;
import com.intellij.openapi.project.DumbAwareAction;
import com.intellij.openapi.project.Project; import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.DialogWrapper;
import com.intellij.openapi.ui.Splitter; import com.intellij.openapi.ui.Splitter;
@@ -75,7 +75,9 @@ public class ToBeMergedDialog extends DialogWrapper {
setTitle(title); setTitle(title);
myProject = project; myProject = project;
myListsEngine = new BasePageEngine<CommittedChangeList>(lists, ourPageSize); // todo removing pages for a while
//myListsEngine = new BasePageEngine<CommittedChangeList>(lists, ourPageSize);
myListsEngine = new BasePageEngine<CommittedChangeList>(lists, lists.size());
myPanel = new JPanel(new BorderLayout()); myPanel = new JPanel(new BorderLayout());
myWiseSelection = new QuantitySelection<Long>(true); myWiseSelection = new QuantitySelection<Long>(true);
@@ -299,7 +301,7 @@ public class ToBeMergedDialog extends DialogWrapper {
return myPanel; return myPanel;
} }
private class MySelectAll extends AnAction { private class MySelectAll extends DumbAwareAction {
private MySelectAll() { private MySelectAll() {
super("Select All", "Select All", IconLoader.getIcon("/actions/selectall.png")); super("Select All", "Select All", IconLoader.getIcon("/actions/selectall.png"));
} }
@@ -311,7 +313,7 @@ public class ToBeMergedDialog extends DialogWrapper {
} }
} }
private class MyUnselectAll extends AnAction { private class MyUnselectAll extends DumbAwareAction {
private MyUnselectAll() { private MyUnselectAll() {
super("Unselect All", "Unselect All", IconLoader.getIcon("/actions/unselectall.png")); super("Unselect All", "Unselect All", IconLoader.getIcon("/actions/unselectall.png"));
} }