|
Lines 873-879
Link Here
|
| 873 |
// be version-controlled we want to avoid gratuitous format changes. |
873 |
// be version-controlled we want to avoid gratuitous format changes. |
| 874 |
for (Map.Entry<String, Object> entry: new TreeMap<String, Object>(m).entrySet()) { |
874 |
for (Map.Entry<String, Object> entry: new TreeMap<String, Object>(m).entrySet()) { |
| 875 |
String name = entry.getKey(); |
875 |
String name = entry.getKey(); |
| 876 |
if (name.equals("installerState") || name.equals("name")) { // NOI18N |
876 |
if ( |
|
|
877 |
name.equals("installerState") || name.equals("name") || // NOI18N |
| 878 |
name.equals("deps") // NOI18N |
| 879 |
) { |
| 877 |
// Skip this one, it is a pseudo-param. |
880 |
// Skip this one, it is a pseudo-param. |
| 878 |
continue; |
881 |
continue; |
| 879 |
} |
882 |
} |
|
Lines 1036-1042
Link Here
|
| 1036 |
for (Module m : mgr.getModules()) { |
1039 |
for (Module m : mgr.getModules()) { |
| 1037 |
DiskStatus status = statuses.get(m.getCodeNameBase()); |
1040 |
DiskStatus status = statuses.get(m.getCodeNameBase()); |
| 1038 |
if (status != null) { |
1041 |
if (status != null) { |
| 1039 |
moduleChanged(m, status); |
1042 |
moduleChanged(m, status); |
| 1040 |
m.addPropertyChangeListener(listener); |
1043 |
m.addPropertyChangeListener(listener); |
| 1041 |
} |
1044 |
} |
| 1042 |
} |
1045 |
} |
|
Lines 1117-1123
Link Here
|
| 1117 |
synchronized (status) { |
1120 |
synchronized (status) { |
| 1118 |
LOG.log(Level.FINE, "moduleChanged: {0}", m); |
1121 |
LOG.log(Level.FINE, "moduleChanged: {0}", m); |
| 1119 |
Map<String,Object> newProps = computeProperties(m); |
1122 |
Map<String,Object> newProps = computeProperties(m); |
| 1120 |
if (! Utilities.compareObjects(status.diskProps, newProps)) { |
1123 |
int cnt = 0; |
|
|
1124 |
for (Map.Entry<String, Object> entry : status.diskProps.entrySet()) { |
| 1125 |
if (entry.getKey().equals("deps")) { // NOI18N |
| 1126 |
continue; |
| 1127 |
} |
| 1128 |
Object snd = newProps.get(entry.getKey()); |
| 1129 |
if (!entry.getValue().equals(snd)) { |
| 1130 |
cnt = -1; |
| 1131 |
break; |
| 1132 |
} |
| 1133 |
cnt++; |
| 1134 |
} |
| 1135 |
if (cnt != newProps.size()) { |
| 1121 |
if (LOG.isLoggable(Level.FINE)) { |
1136 |
if (LOG.isLoggable(Level.FINE)) { |
| 1122 |
Set<Map.Entry<String,Object>> changes = new HashSet<Map.Entry<String,Object>>(newProps.entrySet()); |
1137 |
Set<Map.Entry<String,Object>> changes = new HashSet<Map.Entry<String,Object>>(newProps.entrySet()); |
| 1123 |
changes.removeAll(status.diskProps.entrySet()); |
1138 |
changes.removeAll(status.diskProps.entrySet()); |