Revision 38423

View differences:

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/PackagePropertiesFilterPanel.java
129 129

  
130 130
	public void resetPanel() {
131 131
		model.removeAllElements();
132
//		optionFilter = null;
132
		
133
		// optionFilter = null;
133 134
		PackageFilter filter = null;
134 135
		packagesTablePanel.setFilter(filter);
135 136
	}
......
140 141
				.getSelectPackagesPanel().getModel().getInstallPackageService();
141 142

  
142 143
		if ("categories".equals(e.getActionCommand())) {
143
//			this.optionFilter = PropertiesFilter.CATEGORIES;
144
			model.removeAllElements();
145
			packagesTablePanel.resetPanel();
146

  
147
			List<String> categories = service.getCategories();
148

  
149
			model.add(0,new AllFilter());
150
			if (categories != null) {
151
				for (int i = 0; i < categories.size(); i++) {
152
					model.add(i+1, new CategoryFilter(categories.get(i)));
153
				}
154
			}
144
		    
145
		    packagesTablePanel.resetPanel();
146
		    loadCategories();
155 147
			
156 148
		} else {
157 149
			if ("types".equals(e.getActionCommand())) {
......
206 198
		}
207 199

  
208 200
	}
201
	
202
	private void loadCategories() {
203
	       
204
	    InstallPackageService service = packagesTablePanel
205
               .getSelectPackagesPanel().getModel().getInstallPackageService();
206
        model.removeAllElements();
209 207

  
208
        List<String> categories = service.getCategories();
209

  
210
        model.add(0,new AllFilter());
211
        if (categories != null) {
212
            for (int i = 0; i < categories.size(); i++) {
213
                model.add(i+1, new CategoryFilter(categories.get(i)));
214
            }
215
        }
216
        jList.setSelectedIndex(0);
217
	    
218
	}
219
	
220
	public void setInitialFilter() {
221
	    loadCategories();
222
	}
223

  
210 224
}
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/SelectPackagesPanel.java
119 119
		if (wizard.isDefaultPackagesSelectionSet()) {
120 120
			pluginsTableModel.selectDefaultPackages();
121 121
		}
122
		
123
		
124
		
125
		
122 126

  
123 127
	}
124 128

  
......
134 138
		packagesTablePanel.clearAllPanels();
135 139
	}
136 140

  
141
    /**
142
     * 
143
     */
144
    public void setInitialFilter() {
145
        packagesTablePanel.setInitialFilter();
146
        
147
    }
148

  
137 149
}
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/PackagesTablePanel.java
162 162
		gridBagConstraints.weighty = 0.3;
163 163
		gridBagConstraints.insets = new Insets(2, 2, 2, 2);
164 164
		add(descriptionScrollPane, gridBagConstraints);
165
		
166
		// filterPanel.setInitialFilter();
165 167
	}
166 168

  
167 169
	public void resetFilter() {
......
340 342
		descriptionTextEditor.setText("");
341 343
	}
342 344

  
345
    /**
346
     * 
347
     */
348
    public void setInitialFilter() {
349
        filterPanel.setInitialFilter();
350
    }
351

  
343 352
}
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/wizard/SelectPackagesWizard.java
218 218
				.getInstallerExecutionService();
219 219

  
220 220
		selectPackagesPanel.updatePanel();
221
		selectPackagesPanel.setInitialFilter();
221 222

  
222 223
		// if default packages must be selected or not
223 224
		if (installerExecutionWizard.getSelectDefaultPackages()) {

Also available in: Unified diff