Revision 37585 branches/v2_0_0_prep/extensions/org.gvsig.installer/org.gvsig.installer.swing/org.gvsig.installer.swing.impl/src/main/java/org/gvsig/installer/swing/impl/execution/panel/model/PackagesTableModel.java

View differences:

PackagesTableModel.java
44 44
import org.gvsig.installer.lib.api.creation.MakePluginPackageServiceException;
45 45
import org.gvsig.installer.lib.api.execution.InstallPackageService;
46 46
import org.gvsig.installer.swing.api.SwingInstallerManager;
47
import org.gvsig.installer.swing.impl.execution.panel.filters.NameAndDescriptionFilter;
47
import org.gvsig.installer.swing.impl.execution.panel.filters.NameDescriptionOrCodeFilter;
48 48
import org.gvsig.installer.swing.impl.execution.panel.filters.PackageFilter;
49 49

  
50 50
public class PackagesTableModel extends AbstractTableModel {
......
73 73

  
74 74
	boolean isOfficial;
75 75
	private File pluginsFolder;
76
	private NameAndDescriptionFilter packageFastFilter = null;
76
	private NameDescriptionOrCodeFilter packageFastFilter = null;
77 77
	private PackageFilter packageFilter = null;
78 78

  
79 79
	public PackagesTableModel(SwingInstallerManager swingInstallerManager,
......
91 91

  
92 92
		columnNames = new String[] {
93 93
				"", // Check column
94
				"", "", swingInstallerManager.getText("name"),
95
				swingInstallerManager.getText("version"),
96
				swingInstallerManager.getText("type") };
94
				"", "", swingInstallerManager.getText("_name"),
95
				swingInstallerManager.getText("_version"),
96
				swingInstallerManager.getText("_type") };
97 97

  
98 98
	}
99 99

  
......
318 318
			return installerInfo.getVersion();
319 319
		case 5:
320 320
			return installerInfo.getType();
321
			// case 5:
322
			// if (installerInfo.getOperatingSystem().equals(
323
			// installerInfo.getArchitecture())) {
324
			// return "all";
325
			// } else {
326
			// return installerInfo.getOperatingSystem() + " "
327
			// + installerInfo.getArchitecture();
328
			// }
329 321
		default:
330 322
			return "";
331 323

  
......
541 533
		this.packageFilter = filter;
542 534
	}
543 535

  
544
	public void setFilter(NameAndDescriptionFilter filter) {
536
	public void setFilter(NameDescriptionOrCodeFilter filter) {
545 537
		this.packageFastFilter = filter;
546 538
	}
547 539

  

Also available in: Unified diff