Revision 37587 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
117 117
		for (int i = 0; i < installerExecutionService.getPackageCount(); i++) {
118 118
			PackageInfo installerInfo = installerExecutionService
119 119
					.getPackageInfo(i);
120
			if (installerInfo.isOfficial() == isOfficial) {
121
				TablePackageInfo info = new TablePackageInfo(installerInfo,
122
						false, true);
123
				if (defaultIDs != null) {
124

  
125
					for (int j = 0; j < defaultIDs.size(); j++) {
126
						if (info.getPackageInfo().matchID(defaultIDs.get(j))) {
127
							if (info.getPackageInfo().getOperatingSystem()
128
									.equals(
129
											installerManager
130
													.getOperatingSystem())
131
									|| info.getPackageInfo()
132
											.getOperatingSystem().equals("all")) {
133
								info.setDefault(true);
134
								break;
135
							}
136

  
120
			TablePackageInfo info = new TablePackageInfo(installerInfo, false,
121
					true);
122
			if (defaultIDs != null) {
123
				for (int j = 0; j < defaultIDs.size(); j++) {
124
					if (info.getPackageInfo().matchID(defaultIDs.get(j))) {
125
						if (info.getPackageInfo().getOperatingSystem().equals(
126
								installerManager.getOperatingSystem())
127
								|| info.getPackageInfo().getOperatingSystem()
128
										.equals("all")) {
129
							info.setDefault(true);
130
							break;
137 131
						}
138
					}
139 132

  
133
					}
140 134
				}
141 135
				infos.put(info.getID(), info);
142 136
			}
......
147 141
					.getInstalledPackages(pluginsFolder);
148 142

  
149 143
			for (int i = 0; i < installedPackages.length; i++) {
150
				if (installedPackages[i].isOfficial() == isOfficial) {
151
					TablePackageInfo info = new TablePackageInfo(
152
							installedPackages[i], true, false);
153
					TablePackageInfo x = infos.get(info.getID());
154
					if (x == null) {
155
						infos.put(info.getID(), info);
156
					} else {
157
						x.setInstalled(true);
158
					}
144
				TablePackageInfo info = new TablePackageInfo(
145
						installedPackages[i], true, false);
146
				TablePackageInfo x = infos.get(info.getID());
147
				if (x == null) {
148
					infos.put(info.getID(), info);
149
				} else {
150
					x.setInstalled(true);
159 151
				}
160 152
			}
161 153
		} catch (MakePluginPackageServiceException e) {

Also available in: Unified diff