[jbosstools-commits] JBoss Tools SVN: r26721 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core.
Author: adietish
Date: 2010-11-18 12:10:50 -0500 (Thu, 18 Nov 2010)
New Revision: 26721
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java
Log:
[JBIDE-7628] loadClouds made private -> no explicit loading by clients, clouds should
be loaded if needed
[JBIDE-7628] added proper throwing (no swallowing any more)
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java 2010-11-18
17:07:03 UTC (rev 26720)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java 2010-11-18
17:10:50 UTC (rev 26721)
@@ -35,13 +35,13 @@
private static final DeltaCloudManager INSTANCE = new DeltaCloudManager();
public final static String CLOUDFILE_NAME = "clouds.xml"; //$NON-NLS-1$
- private List<DeltaCloud> clouds = new ArrayList<DeltaCloud>();
+ private List<DeltaCloud> clouds;
private ListenerList cloudManagerListeners;
private DeltaCloudManager() {
}
- public void loadClouds() throws DeltaCloudException {
+ private void loadClouds() throws DeltaCloudException {
clouds = new ArrayList<DeltaCloud>(); // clear present clouds
DeltaCloudMultiException connectionException = new
DeltaCloudMultiException("Errors occurred while loading clouds from the
preferences");
IPath stateLocation = Activator.getDefault().getStateLocation();
@@ -121,7 +121,7 @@
return imageFilterRules;
}
- public void saveClouds() {
+ public void saveClouds() throws DeltaCloudException {
try {
File cloudFile = getOrCreateCloudFile();
if (cloudFile.exists()) {
@@ -135,7 +135,8 @@
p.close();
}
} catch (Exception e) {
- Activator.log(e);
+ // TODO: internationalize strings
+ throw new DeltaCloudException("Could not save clouds", e);
}
}
@@ -164,7 +165,10 @@
return INSTANCE;
}
- public DeltaCloud[] getClouds() {
+ public DeltaCloud[] getClouds() throws DeltaCloudException {
+ if (clouds == null) {
+ loadClouds();
+ }
return clouds.toArray(new DeltaCloud[clouds.size()]);
}
@@ -176,7 +180,7 @@
return null;
}
- public void addCloud(DeltaCloud d) {
+ public void addCloud(DeltaCloud d) throws DeltaCloudException {
clouds.add(d);
saveClouds();
notifyListeners(ICloudManagerListener.ADD_EVENT);
@@ -189,7 +193,7 @@
notifyListeners(ICloudManagerListener.REMOVE_EVENT);
}
- public void notifyCloudRename() {
+ public void notifyCloudRename() throws DeltaCloudException {
saveClouds();
notifyListeners(ICloudManagerListener.RENAME_EVENT);
}
@@ -209,7 +213,7 @@
if (cloudManagerListeners != null) {
Object[] listeners = cloudManagerListeners.getListeners();
for (int i = 0; i < listeners.length; ++i) {
- ((ICloudManagerListener) listeners[i]).changeEvent(type);
+ ((ICloudManagerListener) listeners[i]).cloudsChanged(type);
}
}
}