(Possibly) temporary check-in to diagnose build issue with resource bundles. (9/5/07)
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/DomainLoadingStrategyRegistry.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/DomainLoadingStrategyRegistry.java
index 6d180b5..f0acd69 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/DomainLoadingStrategyRegistry.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/DomainLoadingStrategyRegistry.java
@@ -57,7 +57,7 @@
/**
* Loads registry with descriptors from the domainLoadingStrategies ext-pt.
*/
- synchronized void init(){
+ synchronized final void init(){
IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry();
IExtensionPoint point = extensionRegistry.getExtensionPoint(JSFCommonPlugin.PLUGIN_ID, EXTENSION_POINT_ID );
if (point != null) {
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IResourceBundleProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IResourceBundleProvider.java
index 640da35..1e862c1 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IResourceBundleProvider.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IResourceBundleProvider.java
@@ -10,6 +10,8 @@
*******************************************************************************/
package org.eclipse.jst.jsf.common.metadata.internal;
+import java.io.IOException;
+import java.net.MalformedURLException;
import java.util.ResourceBundle;
/**
@@ -19,5 +21,5 @@
/**
* @return ResourceBundle - implementers should eat exceptions and return null whenever resourceBundle cannot be returned
*/
- public ResourceBundle getResourceBundle();
+ public ResourceBundle getResourceBundle() throws IOException, MalformedURLException;
}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/StandardMetaDataFileRegistry.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/StandardMetaDataFileRegistry.java
index ad40912..c8621e5 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/StandardMetaDataFileRegistry.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/StandardMetaDataFileRegistry.java
@@ -16,12 +16,12 @@
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
+import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.MissingResourceException;
import java.util.ResourceBundle;
import org.eclipse.core.runtime.FileLocator;
@@ -183,15 +183,15 @@
/* (non-Javadoc)
* @see org.eclipse.jst.jsf.common.metadata.internal.IMetaDataSourceModelProvider#getResourceBundle()
*/
- private ResourceBundle internalGetResourceBundle() {
+ private ResourceBundle internalGetResourceBundle()throws IOException, MalformedURLException {
if (getFileLocator() != null){
- try {
+// try {
return fileLocator.getResourceBundle();
- } catch (MissingResourceException e) {
- //eat it
- } catch (IOException e) {
- //eat it
- }
+// } catch (MissingResourceException e) {
+// //eat it
+// } catch (IOException e) {
+// //eat it
+// }
}
return null;
}
@@ -232,7 +232,7 @@
} else if (klass == IResourceBundleProvider.class) {
return new IResourceBundleProvider(){
- public ResourceBundle getResourceBundle() {
+ public ResourceBundle getResourceBundle() throws IOException, MalformedURLException {
return mdp.internalGetResourceBundle();
}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/TraitValueHelper.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/TraitValueHelper.java
index d45da0f..f3031b3 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/TraitValueHelper.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/TraitValueHelper.java
@@ -11,6 +11,8 @@
********************************************************************************/
package org.eclipse.jst.jsf.common.metadata.internal;
+import java.io.IOException;
+import java.net.MalformedURLException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -160,6 +162,10 @@
} catch (MissingResourceException e){
//fall thru
JSFCommonPlugin.log(e, NLS.bind(Messages.MissingResource_exception, new String[]{key}));
+ } catch (MalformedURLException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
}
return key + KEY_NOT_FOUND;
}
