Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcbateman2007-09-25 00:39:19 +0000
committercbateman2007-09-25 00:39:19 +0000
commit9d1b5eed9c17fb2a8142f1bf15df7920bbbdc848 (patch)
treef8130993c1b5f8162f6ab98889bc389eb3b31c98
parent40642ce88c60fbbfc3520e7e10e2793c9caaa8e3 (diff)
downloadwebtools.jsf-9d1b5eed9c17fb2a8142f1bf15df7920bbbdc848.tar.gz
webtools.jsf-9d1b5eed9c17fb2a8142f1bf15df7920bbbdc848.tar.xz
webtools.jsf-9d1b5eed9c17fb2a8142f1bf15df7920bbbdc848.zip
-removed direct access to PreviewUtil fields.
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfcore/LoadBundleTagConverter.java12
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/LoadBundleOperation.java12
2 files changed, 12 insertions, 12 deletions
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfcore/LoadBundleTagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfcore/LoadBundleTagConverter.java
index 760808065..7cb56ba4a 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfcore/LoadBundleTagConverter.java
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfcore/LoadBundleTagConverter.java
@@ -103,17 +103,17 @@ public class LoadBundleTagConverter extends HiddenTagConverter
PropertyResourceBundle bundle = new PropertyResourceBundle(ins);
if (bundle != null)
{
- if (PreviewUtil.BUNDLE_MAP == null)
+ if (PreviewUtil.getBUNDLE_MAP() == null)
{
- PreviewUtil.BUNDLE_MAP = new HashMap();
+ PreviewUtil.setBUNDLE_MAP(new HashMap());
}
else
{
- PreviewUtil.BUNDLE_MAP.clear();
+ PreviewUtil.getBUNDLE_MAP().clear();
}
- PreviewUtil.BUNDLE_MAP.put(varString, bundle);
- PreviewUtil.BUNDLE = bundle;
- PreviewUtil.VAR = varString;
+ PreviewUtil.getBUNDLE_MAP().put(varString, bundle);
+ PreviewUtil.setBUNDLE(bundle);
+ PreviewUtil.setVAR(varString);
}
}
}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/LoadBundleOperation.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/LoadBundleOperation.java
index af1d68d9e..4299133d1 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/LoadBundleOperation.java
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/LoadBundleOperation.java
@@ -90,14 +90,14 @@ public class LoadBundleOperation extends AbstractTransformOperation {
inputStream = new BufferedInputStream(inputStream);
PropertyResourceBundle bundle = new PropertyResourceBundle(inputStream);
if (bundle != null) {
- if (PreviewUtil.BUNDLE_MAP == null) {
- PreviewUtil.BUNDLE_MAP = new HashMap();
+ if (PreviewUtil.getBUNDLE_MAP() == null) {
+ PreviewUtil.setBUNDLE_MAP(new HashMap());
} else {
- PreviewUtil.BUNDLE_MAP.clear();
+ PreviewUtil.getBUNDLE_MAP().clear();
}
- PreviewUtil.BUNDLE_MAP.put(var, bundle);
- PreviewUtil.BUNDLE = bundle;
- PreviewUtil.VAR = var;
+ PreviewUtil.getBUNDLE_MAP().put(var, bundle);
+ PreviewUtil.setBUNDLE(bundle);
+ PreviewUtil.setVAR(var);
}
}
} catch(IOException ioe) {

Back to the top