major classes refactoring

This commit is contained in:
Athou
2013-04-11 20:49:08 +02:00
parent 54ebf7b9db
commit 5b5ad242e0
31 changed files with 380 additions and 297 deletions

View File

@@ -7,7 +7,7 @@ import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import com.commafeed.backend.dao.UserSettingsService;
import com.commafeed.backend.dao.UserSettingsDAO;
import com.commafeed.backend.model.UserRole.Role;
import com.commafeed.backend.model.UserSettings;
import com.commafeed.frontend.CommaFeedSession;
@@ -34,7 +34,7 @@ import de.agilecoders.wicket.markup.html.bootstrap.extensions.icon.OpenWebIconsC
public class HomePage extends BasePage {
@Inject
UserSettingsService settingsService;
UserSettingsDAO userSettingsDAO;
@Override
public void renderHead(IHeaderResponse response) {
@@ -67,7 +67,7 @@ public class HomePage extends BasePage {
new UserCustomCssReference() {
@Override
protected String getCss() {
UserSettings settings = settingsService
UserSettings settings = userSettingsDAO
.findByUser(CommaFeedSession.get().getUser());
return settings == null ? null : settings
.getCustomCss();