Author: jjohnstn
Date: 2010-08-26 15:47:18 -0400 (Thu, 26 Aug 2010)
New Revision: 24479
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java
Log:
2010-08-26 Jeff Johnston <jjohnstn(a)redhat.com>
* src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java (createKey): Remove
any empty lines so the key will work with RSE.
* src/org/jboss/tools/deltacloud/core/DeltaCloud.java (notifyImageListListeners): Pass
new
cloud argument to listeners.
(notifyInstanceListListeners): Ditto.
(refreshInstance): Fix the check for states to be in the String realm rather than
the State realm.
* src/org/jboss/tools/deltacloud/core/IImageListListener.java: Add new cloud argument
to listChanged notifier method.
* src/org/jboss/tools/deltacloud/core/IInstanceListListener.java: Ditto.
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-08-26 19:46:24
UTC (rev 24478)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-08-26 19:47:18
UTC (rev 24479)
@@ -1,5 +1,7 @@
2010-08-26 Jeff Johnston <jjohnstn(a)redhat.com>
+ * src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java (createKey): Remove
+ any empty lines so the key will work with RSE.
* src/org/jboss/tools/deltacloud/core/DeltaCloud.java (notifyImageListListeners): Pass
new
cloud argument to listeners.
(notifyInstanceListListeners): Ditto.
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java 2010-08-26
19:46:24 UTC (rev 24478)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java 2010-08-26
19:47:18 UTC (rev 24479)
@@ -255,7 +255,11 @@
BufferedReader reader = new BufferedReader(new StringReader(keyText.get(0)));
while ((line = reader.readLine()) != null)
{
- sb.append(line.trim()).append("\n");
+ // We must trim off the white-space from the xml
+ // Complete white-space lines are to be ignored.
+ String trimmedLine = line.trim();
+ if (trimmedLine.length() > 0)
+ sb.append(trimmedLine).append("\n");
}
FileWriter w = new FileWriter(keyFile);
w.write(sb.toString());
Show replies by date