Buttons appearance changed.
1.1 --- a/suggestions_framework/src/org/netbeans/modules/tasklist/suggestions/SuggestionsScanner.java Wed Jan 07 15:51:19 2004 +0000
1.2 +++ b/suggestions_framework/src/org/netbeans/modules/tasklist/suggestions/SuggestionsScanner.java Wed Jan 07 17:57:49 2004 +0000
1.3 @@ -402,9 +402,11 @@
1.4 // there were many soft references or we are getting to maxMemory limit
1.5 if (!interrupted) {
1.6 // XXX on most implementations it's maxMemory limit
1.7 - interrupted = true;
1.8 - if (progressMonitor != null) {
1.9 - progressMonitor.scanTerminated(-1);
1.10 + if (Runtime.getRuntime().freeMemory() < 10000 ) {
1.11 + interrupted = true;
1.12 + if (progressMonitor != null) {
1.13 + progressMonitor.scanTerminated(-1);
1.14 + }
1.15 }
1.16 }
1.17 }
2.1 --- a/tasklist.docscan/src/org/netbeans/modules/tasklist/docscan/SourceTasksView.java Wed Jan 07 15:51:19 2004 +0000
2.2 +++ b/tasklist.docscan/src/org/netbeans/modules/tasklist/docscan/SourceTasksView.java Wed Jan 07 17:57:49 2004 +0000
2.3 @@ -402,8 +402,8 @@
2.4 handleRefresh();
2.5 }
2.6 });
2.7 + adjustHeight(button);
2.8 refresh = button;
2.9 - adjustHeight(refresh);
2.10 }
2.11 return refresh;
2.12 }
2.13 @@ -416,8 +416,8 @@
2.14 handlePrev();
2.15 }
2.16 });
2.17 + adjustHeight(button);
2.18 prev = button;
2.19 - adjustHeight(prev);
2.20 }
2.21 return prev;
2.22 }
2.23 @@ -430,8 +430,8 @@
2.24 handleNext();
2.25 }
2.26 });
2.27 + adjustHeight(button);
2.28 next = button;
2.29 - adjustHeight(next);
2.30 }
2.31 return next;
2.32 }
2.33 @@ -478,15 +478,16 @@
2.34 private JComponent folderSelector;
2.35 private JComponent getFolderSelector() {
2.36 if (folderSelector == null) {
2.37 - JToggleButton button = new JToggleButton("...");
2.38 + Image image = Utilities.loadImage("org/netbeans/modules/tasklist/docscan/dropdown.gif");
2.39 + JButton button = new JButton(new ImageIcon(image));
2.40 button.setToolTipText("Selects folder to be scanned.");
2.41 button.addActionListener(new ActionListener() {
2.42 public void actionPerformed(ActionEvent e) {
2.43 handleSelectFolder();
2.44 }
2.45 });
2.46 + adjustHeight(button);
2.47 folderSelector = button;
2.48 - button.setBorder(BorderFactory.createEmptyBorder(3, 0, 3, 5));
2.49 }
2.50 return folderSelector;
2.51 }
2.52 @@ -505,8 +506,8 @@
2.53 handleCurrentFile();
2.54 }
2.55 });
2.56 + adjustHeight(button);
2.57 currentFile = button;
2.58 - adjustHeight(currentFile);
2.59 }
2.60 return currentFile;
2.61 }
2.62 @@ -528,8 +529,8 @@
2.63 }
2.64 }
2.65 });
2.66 + adjustHeight(button);
2.67 gotoPresenter = button;
2.68 - adjustHeight(gotoPresenter);
2.69 }
2.70 return gotoPresenter;
2.71 }
2.72 @@ -594,10 +595,11 @@
2.73 }
2.74
2.75 /** Toolbar controls must be smaller*/
2.76 - private static void adjustHeight(JComponent c) {
2.77 - // it kills roll-over feature
2.78 - Insets in = c.getInsets();
2.79 - c.setBorder(BorderFactory.createEmptyBorder(3, 5, 3, 5));
2.80 + private static void adjustHeight(AbstractButton c) {
2.81 + Insets in = c.getMargin();
2.82 + in.top = 0;
2.83 + in.bottom = 0;
2.84 + c.setMargin(in);
2.85 }
2.86
2.87 protected Component createNorthComponent() {
2.88 @@ -751,8 +753,6 @@
2.89 }
2.90 }
2.91
2.92 - ((JToggleButton)allFilesButton).setSelected(true);
2.93 - ((JToggleButton)folderSelector).setSelected(true);
2.94 String path = selectedFolder.getPath();
2.95 if ("".equals(path)) { // NOI18N
2.96 try {
2.97 @@ -801,7 +801,6 @@
2.98
2.99 private void handleCurrentFile() {
2.100 if (job != null) return;
2.101 - ((JToggleButton)folderSelector).setSelected(false);
2.102 try {
2.103 if (background != null) handleStop();
2.104 background = null;