You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2016/02/02 11:15:18 UTC
[2/3] syncope git commit: [SYNCOPE-155] Moving from static
initialization to proper Wicket application's init
[SYNCOPE-155] Moving from static initialization to proper Wicket application's init
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/7300f2ff
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/7300f2ff
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/7300f2ff
Branch: refs/heads/master
Commit: 7300f2ff03144768464e246321be8fac6987877f
Parents: 4af3335
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Tue Feb 2 11:14:35 2016 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Tue Feb 2 11:14:35 2016 +0100
----------------------------------------------------------------------
.../console/SyncopeConsoleApplication.java | 56 +++++++++-----------
1 file changed, 26 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/7300f2ff/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java b/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java
index dca3f82..ce7b155 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java
@@ -77,18 +77,36 @@ public class SyncopeConsoleApplication extends AuthenticatedWebApplication {
private static final String ACTIVITI_MODELER_CONTEXT = "activiti-modeler";
- private static Map<String, Class<? extends BasePage>> PAGE_CLASSES;
+ public static SyncopeConsoleApplication get() {
+ return (SyncopeConsoleApplication) WebApplication.get();
+ }
+
+ private String version;
+
+ private String site;
+
+ private String license;
+
+ private String anonymousUser;
+
+ private String anonymousKey;
+
+ private String activitiModelerDirectory;
+
+ private SyncopeClientFactoryBean clientFactory;
+
+ private Map<String, Class<? extends BasePage>> pageClasses;
@SuppressWarnings("unchecked")
- private static void populatePageClasses(final Properties props) {
- Enumeration<String> propNames = (Enumeration<String>) props.propertyNames();
+ protected void populatePageClasses(final Properties props) {
+ Enumeration<String> propNames = (Enumeration<String>) props.<String>propertyNames();
while (propNames.hasMoreElements()) {
String name = propNames.nextElement();
if (name.startsWith("page.")) {
try {
Class<?> clazz = ClassUtils.getClass(props.getProperty(name));
if (BasePage.class.isAssignableFrom(clazz)) {
- PAGE_CLASSES.put(
+ pageClasses.put(
StringUtils.substringAfter("page.", name), (Class<? extends BasePage>) clazz);
} else {
LOG.warn("{} does not extend {}, ignoring...", clazz.getName(), BasePage.class.getName());
@@ -100,24 +118,6 @@ public class SyncopeConsoleApplication extends AuthenticatedWebApplication {
}
}
- public static SyncopeConsoleApplication get() {
- return (SyncopeConsoleApplication) WebApplication.get();
- }
-
- private String version;
-
- private String site;
-
- private String license;
-
- private String anonymousUser;
-
- private String anonymousKey;
-
- private String activitiModelerDirectory;
-
- private SyncopeClientFactoryBean clientFactory;
-
@Override
protected void init() {
super.init();
@@ -160,13 +160,9 @@ public class SyncopeConsoleApplication extends AuthenticatedWebApplication {
clientFactory = new SyncopeClientFactoryBean().setAddress(scheme + "://" + host + ":" + port + "/" + rootPath);
// process page properties
- synchronized (LOG) {
- if (PAGE_CLASSES == null) {
- PAGE_CLASSES = new HashMap<>();
- populatePageClasses(props);
- PAGE_CLASSES = Collections.unmodifiableMap(PAGE_CLASSES);
- }
- }
+ pageClasses = new HashMap<>();
+ populatePageClasses(props);
+ pageClasses = Collections.unmodifiableMap(pageClasses);
// Application settings
IBootstrapSettings settings = new BootstrapSettings();
@@ -264,7 +260,7 @@ public class SyncopeConsoleApplication extends AuthenticatedWebApplication {
}
public Class<? extends BasePage> getPageClass(final String key) {
- return PAGE_CLASSES.get(key);
+ return pageClasses.get(key);
}
public String getVersion() {