jh: bug 205253: EPF 1.2.x no longer allows adding flash file .swf into a RTE field
diff --git a/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/MethodAddImageDialog.java b/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/MethodAddImageDialog.java
index 05f6a6f..3a5806b 100644
--- a/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/MethodAddImageDialog.java
+++ b/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/dialogs/MethodAddImageDialog.java
@@ -92,7 +92,8 @@
okButton.setEnabled(fileToCopy.isFile() && fileToCopy.canRead() && height > 0
&& width > 0);
} catch (Exception e) {
- okButton.setEnabled(false);
+ // if the above fails, let the user click ok if the file is readable
+ okButton.setEnabled(fileToCopy.isFile() && fileToCopy.canRead());
}
}
}
@@ -198,9 +199,15 @@
private void setImageInfo(String imageName) {
File imageFile = new File(imageName);
if (imageFile.exists()) {
- ImageData imageData = new ImageData(imageName);
- heightText.setText(String.valueOf(imageData.height));
- widthText.setText(String.valueOf(imageData.width));
+ try {
+ ImageData imageData = new ImageData(imageName);
+ heightText.setText(String.valueOf(imageData.height));
+ widthText.setText(String.valueOf(imageData.width));
+ } catch (Exception e) {
+ // set default height/width if we can't obtain ImageData
+ heightText.setText(String.valueOf(DEFAULT_HEIGHT));
+ widthText.setText(String.valueOf(DEFAULT_WIDTH));
+ }
} else {
heightText.setText(String.valueOf(DEFAULT_HEIGHT));
widthText.setText(String.valueOf(DEFAULT_WIDTH));
