Revision 43126 trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.installer/org.gvsig.installer.swing/org.gvsig.installer.swing.impl/src/main/java/org/gvsig/installer/swing/impl/execution/panel/PackagesTablePanel.java

View differences:

PackagesTablePanel.java
34 34
import java.awt.Insets;
35 35
import java.awt.event.MouseEvent;
36 36
import java.awt.event.MouseListener;
37
import java.io.IOException;
38 37
import java.io.InputStream;
39 38
import java.net.URL;
40 39
import java.util.List;
41 40
import java.util.Locale;
42
import java.util.logging.Level;
43
import java.util.logging.Logger;
44 41

  
45 42
import javax.swing.JEditorPane;
46 43
import javax.swing.JPanel;
......
49 46
import javax.swing.event.ListSelectionEvent;
50 47
import javax.swing.event.ListSelectionListener;
51 48
import javax.swing.table.TableColumnModel;
52
import org.apache.commons.io.FileUtils;
53 49
import org.apache.commons.io.IOUtils;
54 50
import org.apache.commons.lang3.StringUtils;
55 51

  
56 52
import org.gvsig.installer.lib.api.PackageInfo;
57 53
import org.gvsig.installer.swing.api.SwingInstallerLocator;
58 54
import org.gvsig.installer.swing.api.SwingInstallerManager;
55
import org.gvsig.installer.swing.impl.execution.panel.filters.AndFilter;
59 56
import org.gvsig.installer.swing.impl.execution.panel.filters.NameDescriptionOrCodeFilter;
60
import org.gvsig.installer.swing.impl.execution.panel.filters.PackageFilter;
57
import org.gvsig.installer.swing.api.execution.PackageFilter;
61 58
import org.gvsig.installer.swing.impl.execution.panel.model.PackagesTableModel;
62 59
import org.gvsig.installer.swing.impl.execution.panel.model.PackagesTableModel.PackageOfficialRecommended;
63 60
import org.gvsig.installer.swing.impl.execution.panel.model.PackagesTableModel.PackageOsAndArchitecture;
......
85 82
	private PackagePropertiesFilterPanel filterPanel;
86 83
	private FastFilterButtonsPanel fastFilterPanel;
87 84
	private SelectPackagesPanel selectPackagesPanel;
85
        
86
        private PackageFilter baseFilter = null;
88 87

  
89 88
	public PackagesTablePanel(SelectPackagesPanel selectPackagesPanel) {
90 89
		super();
......
338 337
        }
339 338

  
340 339
	public void setFilter(PackageFilter filter) {
341
		PackagesTableModel pluginsTableModel = (PackagesTableModel) pluginsTable
342
				.getModel();
343
		pluginsTableModel.setFilter(filter);
344
		selectPackagesPanel.updatePanel();
340
            PackagesTableModel pluginsTableModel = (PackagesTableModel) pluginsTable.getModel();
341
            if( baseFilter == null ) {
342
                pluginsTableModel.setFilter(filter);
343
            } else {
344
                pluginsTableModel.setFilter(new AndFilter().add(this.baseFilter).add(filter));
345
            }
346
            selectPackagesPanel.updatePanel();
345 347
	}
346 348

  
347
	public void setFilter(NameDescriptionOrCodeFilter filter) {
348
		PackagesTableModel pluginsTableModel = (PackagesTableModel) pluginsTable
349
				.getModel();
350
		pluginsTableModel.setFilter(filter);
351
		selectPackagesPanel.updatePanel();
352
	}
349
        public void setBaseFilter(PackageFilter filter) {
350
            this.baseFilter = filter;
351
            this.setFilter(null);
352
        }
353 353

  
354
        public void setEnabledTypeFilter(boolean enabled) {
355
            this.filterPanel.setEnabledTypeFilter(enabled);            
356
        }
357
        
354 358
	private class MyMouseListener implements MouseListener {
355 359

  
356 360
		public void mouseClicked(MouseEvent e) {

Also available in: Unified diff