components/visual-panels/apache/src/java/vpanels/app/apache/com/oracle/solaris/vp/panels/apache/client/swing/Modules.java
equal
deleted
inserted
replaced
18 * |
18 * |
19 * CDDL HEADER END |
19 * CDDL HEADER END |
20 */ |
20 */ |
21 |
21 |
22 /* |
22 /* |
23 * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. |
23 * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. |
24 */ |
24 */ |
25 |
25 |
26 package com.oracle.solaris.vp.panels.apache.client.swing; |
26 package com.oracle.solaris.vp.panels.apache.client.swing; |
27 |
27 |
28 import java.util.*; |
28 import java.util.*; |
149 return null; |
149 return null; |
150 } |
150 } |
151 } |
151 } |
152 |
152 |
153 public void refresh(boolean force) throws ScfException { |
153 public void refresh(boolean force) throws ScfException { |
154 ServiceMXBean service = info.getPanelDescriptor().getService(); |
154 ServiceBean service = info.getPanelDescriptor().getService(); |
155 String group = info.getPropertyGroupName(); |
155 String group = info.getPropertyGroupName(); |
156 |
156 |
157 // Build list of names of Module properties |
157 // Build list of names of Module properties |
158 List<String> properties = new ArrayList<String>(); |
158 List<String> properties = new ArrayList<String>(); |
159 for (String property : service.getPropertyNames(group)) { |
159 for (String property : service.getPropertyNames(group)) { |
162 } |
162 } |
163 } |
163 } |
164 Collections.sort(properties); |
164 Collections.sort(properties); |
165 |
165 |
166 // Remove names of properties that are pending removal on client |
166 // Remove names of properties that are pending removal on client |
167 for (Iterator<Module> i = removed.iterator(); i.hasNext();) { |
167 for (Iterator<Module> i = removed.iterator(); i.hasNext(); ) { |
168 Module module = i.next(); |
168 Module module = i.next(); |
169 String property = module.getPropertyName(); |
169 String property = module.getPropertyName(); |
170 if (properties.remove(property)) { |
170 if (properties.remove(property)) { |
171 // Pending removal on client, still exists on server |
171 // Pending removal on client, still exists on server |
172 } else { |
172 } else { |
224 for (Module module : getChildren()) { |
224 for (Module module : getChildren()) { |
225 module.saveToRepo(); |
225 module.saveToRepo(); |
226 } |
226 } |
227 addedProperty.setValue(0); |
227 addedProperty.setValue(0); |
228 |
228 |
229 for (Iterator<Module> i = removed.iterator(); i.hasNext();) |
229 for (Iterator<Module> i = removed.iterator(); i.hasNext(); ) |
230 { |
230 { |
231 Module module = i.next(); |
231 Module module = i.next(); |
232 module.removeFromRepo(); |
232 module.removeFromRepo(); |
233 i.remove(); |
233 i.remove(); |
234 int n = removed.size(); |
234 int n = removed.size(); |