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/03 17:07:15 UTC
syncope git commit: Useless import static + some Java 7
Repository: syncope
Updated Branches:
refs/heads/master 9c132dc2d -> 15e3c8b79
Useless import static + some Java 7
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/15e3c8b7
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/15e3c8b7
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/15e3c8b7
Branch: refs/heads/master
Commit: 15e3c8b79609a6657b9647a2c140ea69f88e4b2a
Parents: 9c132dc
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Wed Feb 3 17:07:01 2016 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Wed Feb 3 17:07:01 2016 +0100
----------------------------------------------------------------------
.../client/console/tasks/PropagationTasks.java | 7 +++----
.../syncope/client/console/tasks/PushTasks.java | 6 ++----
.../console/tasks/SchedTaskSearchResultPanel.java | 16 ++++++----------
.../syncope/client/console/tasks/SyncTasks.java | 6 ++----
4 files changed, 13 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/15e3c8b7/client/console/src/main/java/org/apache/syncope/client/console/tasks/PropagationTasks.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/PropagationTasks.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/PropagationTasks.java
index 749f0cd..25689de 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/PropagationTasks.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/PropagationTasks.java
@@ -18,8 +18,6 @@
*/
package org.apache.syncope.client.console.tasks;
-import static org.apache.syncope.client.console.panels.MultilevelPanel.FIRST_LEVEL_ID;
-
import org.apache.syncope.client.console.panels.MultilevelPanel;
import org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal;
import org.apache.syncope.common.lib.to.AnyTO;
@@ -37,13 +35,14 @@ public class PropagationTasks extends AbstractTasks {
final MultilevelPanel mlp = new MultilevelPanel("tasks");
add(mlp);
- mlp.setFirstLevel(new PropagationTaskSearchResultPanel(FIRST_LEVEL_ID, resource, pageReference) {
+ mlp.setFirstLevel(
+ new PropagationTaskSearchResultPanel(MultilevelPanel.FIRST_LEVEL_ID, resource, pageReference) {
private static final long serialVersionUID = -2195387360323687302L;
@Override
protected void viewTask(final PropagationTaskTO taskTO, final AjaxRequestTarget target) {
- mlp.next("task.view", new TaskExecutionDetails<PropagationTaskTO>(taskTO, pageReference), target);
+ mlp.next("task.view", new TaskExecutionDetails<>(taskTO, pageReference), target);
}
});
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/15e3c8b7/client/console/src/main/java/org/apache/syncope/client/console/tasks/PushTasks.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/PushTasks.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/PushTasks.java
index fc816f6..9db40a4 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/PushTasks.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/PushTasks.java
@@ -18,8 +18,6 @@
*/
package org.apache.syncope.client.console.tasks;
-import static org.apache.syncope.client.console.panels.MultilevelPanel.FIRST_LEVEL_ID;
-
import org.apache.syncope.client.console.panels.MultilevelPanel;
import org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal;
import org.apache.syncope.common.lib.to.AnyTO;
@@ -39,7 +37,7 @@ public class PushTasks extends AbstractTasks {
final MultilevelPanel mlp = new MultilevelPanel("tasks");
add(mlp);
- mlp.setFirstLevel(new PushTaskSearchResultPanel(FIRST_LEVEL_ID, resource, pageReference) {
+ mlp.setFirstLevel(new PushTaskSearchResultPanel(MultilevelPanel.FIRST_LEVEL_ID, resource, pageReference) {
private static final long serialVersionUID = -2195387360323687302L;
@@ -47,7 +45,7 @@ public class PushTasks extends AbstractTasks {
protected void viewTask(final PushTaskTO taskTO, final AjaxRequestTarget target) {
mlp.next(
new StringResourceModel("task.view", this, new Model<>(taskTO)).getObject(),
- new TaskExecutionDetails<PushTaskTO>(taskTO, pageReference), target);
+ new TaskExecutionDetails<>(taskTO, pageReference), target);
}
});
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/15e3c8b7/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskSearchResultPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskSearchResultPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskSearchResultPanel.java
index ac00e03..c253494 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskSearchResultPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskSearchResultPanel.java
@@ -18,8 +18,6 @@
*/
package org.apache.syncope.client.console.tasks;
-import static org.apache.wicket.Component.ENABLE;
-
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -78,7 +76,7 @@ public abstract class SchedTaskSearchResultPanel<T extends SchedTaskTO> extends
LOG.error("Falure instantiating task", e);
}
- this.addNewItemPanelBuilder(new SchedTaskWizardBuilder<T>(schedTaskTO, pageRef), true);
+ this.addNewItemPanelBuilder(new SchedTaskWizardBuilder<>(schedTaskTO, pageRef), true);
MetaDataRoleAuthorizationStrategy.authorize(addAjaxLink, ENABLE, StandardEntitlement.TASK_CREATE);
@@ -86,7 +84,7 @@ public abstract class SchedTaskSearchResultPanel<T extends SchedTaskTO> extends
}
protected List<IColumn<T, String>> getFieldColumns() {
- final List<IColumn<T, String>> columns = new ArrayList<IColumn<T, String>>();
+ final List<IColumn<T, String>> columns = new ArrayList<>();
columns.add(new PropertyColumn<T, String>(
new StringResourceModel("key", this, null), "key", "key"));
@@ -109,8 +107,7 @@ public abstract class SchedTaskSearchResultPanel<T extends SchedTaskTO> extends
if (model != null && model.getObject() instanceof String) {
String value = String.class.cast(model.getObject());
if (value.length() > 20) {
- item.add(new Label(componentId,
- new Model<String>("..." + value.substring(value.length() - 17))));
+ item.add(new Label(componentId, new Model<>("..." + value.substring(value.length() - 17))));
} else {
item.add(new Label(componentId, getDataModel(rowModel)));
}
@@ -138,7 +135,7 @@ public abstract class SchedTaskSearchResultPanel<T extends SchedTaskTO> extends
@Override
protected final List<IColumn<T, String>> getColumns() {
- final List<IColumn<T, String>> columns = new ArrayList<IColumn<T, String>>();
+ final List<IColumn<T, String>> columns = new ArrayList<>();
columns.addAll(getFieldColumns());
@@ -248,8 +245,7 @@ public abstract class SchedTaskSearchResultPanel<T extends SchedTaskTO> extends
@Override
public ActionLinksPanel<T> getHeader(final String componentId) {
- final ActionLinksPanel.Builder<T> panel
- = ActionLinksPanel.builder(page.getPageReference());
+ final ActionLinksPanel.Builder<T> panel = ActionLinksPanel.builder(page.getPageReference());
return panel.add(new ActionLink<T>() {
@@ -284,7 +280,7 @@ public abstract class SchedTaskSearchResultPanel<T extends SchedTaskTO> extends
@Override
protected SchedTasksProvider<T> dataProvider() {
- return new SchedTasksProvider<T>(reference, TaskType.SCHEDULED, rows);
+ return new SchedTasksProvider<>(reference, TaskType.SCHEDULED, rows);
}
public class SchedTasksProvider<T extends SchedTaskTO> extends TaskDataProvider<T> {
http://git-wip-us.apache.org/repos/asf/syncope/blob/15e3c8b7/client/console/src/main/java/org/apache/syncope/client/console/tasks/SyncTasks.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/SyncTasks.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/SyncTasks.java
index 90bbcdb..5f75b8d 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/SyncTasks.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/SyncTasks.java
@@ -18,8 +18,6 @@
*/
package org.apache.syncope.client.console.tasks;
-import static org.apache.syncope.client.console.panels.MultilevelPanel.FIRST_LEVEL_ID;
-
import org.apache.syncope.client.console.panels.MultilevelPanel;
import org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal;
import org.apache.syncope.common.lib.to.AnyTO;
@@ -39,7 +37,7 @@ public class SyncTasks extends AbstractTasks {
final MultilevelPanel mlp = new MultilevelPanel("tasks");
add(mlp);
- mlp.setFirstLevel(new SyncTaskSearchResultPanel(FIRST_LEVEL_ID, resource, pageReference) {
+ mlp.setFirstLevel(new SyncTaskSearchResultPanel(MultilevelPanel.FIRST_LEVEL_ID, resource, pageReference) {
private static final long serialVersionUID = -2195387360323687302L;
@@ -47,7 +45,7 @@ public class SyncTasks extends AbstractTasks {
protected void viewTask(final SyncTaskTO taskTO, final AjaxRequestTarget target) {
mlp.next(
new StringResourceModel("task.view", this, new Model<>(taskTO)).getObject(),
- new TaskExecutionDetails<SyncTaskTO>(taskTO, pageReference), target);
+ new TaskExecutionDetails<>(taskTO, pageReference), target);
}
});
}