Author: massi
Date: Wed Jun 5 09:25:10 2013
New Revision: 1489768
URL: http://svn.apache.org/r1489768
Log:
unused attributes and something like this
Modified:
syncope/trunk/ (props changed)
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BulkActionModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Reports.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Resources.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Tasks.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Todo.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AjaxDataTablePanel.java
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_1_X:r1489098-1489767
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BulkActionModalPage.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BulkActionModalPage.java?rev=1489768&r1=1489767&r2=1489768&view=diff
==============================================================================
---
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BulkActionModalPage.java
(original)
+++
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BulkActionModalPage.java
Wed Jun 5 09:25:10 2013
@@ -30,7 +30,6 @@ import org.apache.syncope.console.rest.B
import
org.apache.syncope.console.wicket.ajax.markup.html.ClearIndicatingAjaxButton;
import org.apache.syncope.console.wicket.markup.html.form.ActionLink;
import org.apache.syncope.console.wicket.markup.html.form.ActionLinksPanel;
-import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
@@ -49,7 +48,6 @@ public class BulkActionModalPage<T, S> e
private static final long serialVersionUID = 4114026480146090962L;
public BulkActionModalPage(
- final PageReference pageRef,
final ModalWindow window,
final List<T> items,
final List<IColumn<T, S>> columns,
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Reports.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Reports.java?rev=1489768&r1=1489767&r2=1489768&view=diff
==============================================================================
---
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Reports.java
(original)
+++
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Reports.java
Wed Jun 5 09:25:10 2013
@@ -36,7 +36,6 @@ import org.apache.syncope.console.common
import org.apache.syncope.console.markup.html.list.AltListView;
import org.apache.syncope.console.pages.panels.JQueryUITabbedPanel;
import org.apache.syncope.console.rest.LoggerRestClient;
-import org.apache.syncope.console.rest.ReportRestClient;
import
org.apache.syncope.console.wicket.ajax.markup.html.ClearIndicatingAjaxLink;
import
org.apache.syncope.console.wicket.extensions.markup.html.repeater.data.table.ActionColumn;
import
org.apache.syncope.console.wicket.extensions.markup.html.repeater.data.table.DatePropertyColumn;
@@ -88,9 +87,6 @@ public class Reports extends BasePage {
private static final int WIN_WIDTH = 700;
@SpringBean
- private ReportRestClient reportRestClient;
-
- @SpringBean
private LoggerRestClient loggerRestClient;
@SpringBean
@@ -118,7 +114,7 @@ public class Reports extends BasePage {
setupAudit();
}
- @SuppressWarnings({"rawtypes","unchecked"})
+ @SuppressWarnings({"rawtypes", "unchecked"})
private void setupReport() {
reportContainer = new WebMarkupContainer("reportContainer");
setWindowClosedCallback(window, reportContainer);
@@ -461,49 +457,49 @@ public class Reports extends BasePage {
ListView<Enum<?>> categoryView =
new AltListView<Enum<?>>("categoryView", new
ArrayList(category.getSubCategoryElements())) {
- private static final long serialVersionUID =
4949588177564901031L;
+ private static final long serialVersionUID =
4949588177564901031L;
- @Override
- protected void populateItem(final ListItem<Enum<?>>
item) {
- final Enum<?> subcategory = item.getModelObject();
+ @Override
+ protected void populateItem(final ListItem<Enum<?>> item) {
+ final Enum<?> subcategory = item.getModelObject();
- item.add(new Label("subcategory",
subcategory.name()));
- }
- };
+ item.add(new Label("subcategory", subcategory.name()));
+ }
+ };
add(categoryView);
ListView<Enum<?>> successView =
new AltListView<Enum<?>>("successView", new
ArrayList(category.getSubCategoryElements())) {
- private static final long serialVersionUID =
4949588177564901031L;
+ private static final long serialVersionUID =
4949588177564901031L;
- @Override
- protected void populateItem(final ListItem<Enum<?>>
item) {
- final Enum<?> subcategory = item.getModelObject();
-
- final Check<AuditLoggerName> successCheck = new
Check<AuditLoggerName>("successCheck",
- new Model<AuditLoggerName>(
- new AuditLoggerName(category, subcategory,
Result.success)), successGroup);
- item.add(successCheck);
- }
- };
+ @Override
+ protected void populateItem(final ListItem<Enum<?>> item) {
+ final Enum<?> subcategory = item.getModelObject();
+
+ final Check<AuditLoggerName> successCheck = new
Check<AuditLoggerName>("successCheck",
+ new Model<AuditLoggerName>(
+ new AuditLoggerName(category, subcategory,
Result.success)), successGroup);
+ item.add(successCheck);
+ }
+ };
successGroup.add(successView);
ListView<Enum<?>> failureView =
new AltListView<Enum<?>>("failureView", new
ArrayList(category.getSubCategoryElements())) {
- private static final long serialVersionUID =
4949588177564901031L;
+ private static final long serialVersionUID =
4949588177564901031L;
- @Override
- protected void populateItem(final ListItem<Enum<?>>
item) {
- final Enum<?> subcategory = item.getModelObject();
-
- final Check<AuditLoggerName> failureCheck = new
Check<AuditLoggerName>("failureCheck",
- new Model<AuditLoggerName>(
- new AuditLoggerName(category, subcategory,
Result.failure)), failureGroup);
- item.add(failureCheck);
- }
- };
+ @Override
+ protected void populateItem(final ListItem<Enum<?>> item) {
+ final Enum<?> subcategory = item.getModelObject();
+
+ final Check<AuditLoggerName> failureCheck = new
Check<AuditLoggerName>("failureCheck",
+ new Model<AuditLoggerName>(
+ new AuditLoggerName(category, subcategory,
Result.failure)), failureGroup);
+ item.add(failureCheck);
+ }
+ };
failureGroup.add(failureView);
}
}
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Resources.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Resources.java?rev=1489768&r1=1489767&r2=1489768&view=diff
==============================================================================
---
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Resources.java
(original)
+++
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Resources.java
Wed Jun 5 09:25:10 2013
@@ -33,7 +33,6 @@ import org.apache.syncope.console.common
import org.apache.syncope.console.pages.panels.AbstractSearchResultPanel;
import org.apache.syncope.console.pages.panels.AjaxDataTablePanel;
import org.apache.syncope.console.rest.ConnectorRestClient;
-import org.apache.syncope.console.rest.ResourceRestClient;
import
org.apache.syncope.console.wicket.ajax.markup.html.ClearIndicatingAjaxLink;
import org.apache.syncope.console.wicket.markup.html.form.ActionLink;
import org.apache.syncope.console.wicket.markup.html.form.ActionLinksPanel;
@@ -75,9 +74,6 @@ public class Resources extends BasePage
private static final long serialVersionUID = -3789252860990261728L;
@SpringBean
- private ResourceRestClient resourceRestClient;
-
- @SpringBean
private ConnectorRestClient connectorRestClient;
@SpringBean
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Tasks.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Tasks.java?rev=1489768&r1=1489767&r2=1489768&view=diff
==============================================================================
---
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Tasks.java
(original)
+++
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Tasks.java
Wed Jun 5 09:25:10 2013
@@ -46,13 +46,12 @@ import org.apache.wicket.markup.html.Web
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
public class Tasks extends BasePage {
private static final long serialVersionUID = 5289215853622289061L;
- public Tasks(final PageParameters parameters) {
+ public Tasks() {
super();
add(new PropagationTasks("propagation", getPageReference()));
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Todo.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Todo.java?rev=1489768&r1=1489767&r2=1489768&view=diff
==============================================================================
---
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Todo.java
(original)
+++
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Todo.java
Wed Jun 5 09:25:10 2013
@@ -33,7 +33,6 @@ import org.apache.syncope.console.common
import org.apache.syncope.console.commons.SortableDataProviderComparator;
import org.apache.syncope.console.rest.ApprovalRestClient;
import org.apache.syncope.console.rest.UserRequestRestClient;
-import org.apache.syncope.console.rest.UserRestClient;
import
org.apache.syncope.console.wicket.extensions.markup.html.repeater.data.table.DatePropertyColumn;
import org.apache.syncope.console.wicket.markup.html.form.ActionLink;
import org.apache.syncope.console.wicket.markup.html.form.ActionLinksPanel;
@@ -69,9 +68,6 @@ public class Todo extends BasePage {
private ApprovalRestClient approvalRestClient;
@SpringBean
- private UserRestClient userRestClient;
-
- @SpringBean
private UserRequestRestClient userRequestRestClient;
private final ModalWindow editApprovalWin;
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AjaxDataTablePanel.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AjaxDataTablePanel.java?rev=1489768&r1=1489767&r2=1489768&view=diff
==============================================================================
---
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AjaxDataTablePanel.java
(original)
+++
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AjaxDataTablePanel.java
Wed Jun 5 09:25:10 2013
@@ -147,7 +147,6 @@ public class AjaxDataTablePanel<T, S> ex
@Override
public Page createPage() {
return new BulkActionModalPage<T, S>(
- getPage().getPageReference(),
bulkModalWin,
new ArrayList<T>(group.getModelObject()),
columns,
