Repository: syncope Updated Branches: refs/heads/master 63b9416bc -> 016b441a1
[SYNCOPE-156] fix for build #263 Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/016b441a Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/016b441a Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/016b441a Branch: refs/heads/master Commit: 016b441a19e2a7bc4bd393198b166cc91d12df6d Parents: 63b9416 Author: fmartelli <[email protected]> Authored: Thu Jun 18 23:35:53 2015 +0200 Committer: fmartelli <[email protected]> Committed: Thu Jun 18 23:35:53 2015 +0200 ---------------------------------------------------------------------- .../client/console/panels/ConnectorModal.java | 19 +- .../client/console/topology/Topology.java | 230 +++++++++---------- .../console/topology/TopologyNodePanel.java | 2 +- 3 files changed, 123 insertions(+), 128 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/016b441a/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnectorModal.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnectorModal.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnectorModal.java index fee3e06..40aefce 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnectorModal.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnectorModal.java @@ -30,7 +30,6 @@ import java.util.Map; import org.apache.commons.lang3.StringUtils; import org.apache.syncope.client.console.commons.Constants; import org.apache.syncope.client.console.pages.BasePage; -import org.apache.syncope.client.console.panels.ModalContent; import org.apache.syncope.client.console.wicket.markup.html.form.AjaxDropDownChoicePanel; import org.apache.syncope.client.console.wicket.markup.html.form.AjaxTextFieldPanel; import org.apache.syncope.client.console.wicket.markup.html.form.SpinnerFieldPanel; @@ -177,7 +176,7 @@ public class ConnectorModal extends ModalContent { version.setChoices(bundleTO == null ? new ArrayList<String>() : new ArrayList<>(mapConnBundleTOs.get(connInstanceTO.getLocation()). - get(connInstanceTO.getBundleName()).keySet())); + get(connInstanceTO.getBundleName()).keySet())); version.setRequired(true); version.addRequiredLabel(); version.setEnabled(connInstanceTO.getBundleName() != null); @@ -314,16 +313,16 @@ public class ConnectorModal extends ModalContent { connectorPropForm.add(check); // form - third tab (capabilities) - final IModel<List<ConnectorCapability>> capabilities - = new LoadableDetachableModel<List<ConnectorCapability>>() { + final IModel<List<ConnectorCapability>> capabilities = + new LoadableDetachableModel<List<ConnectorCapability>>() { - private static final long serialVersionUID = 5275935387613157437L; + private static final long serialVersionUID = 5275935387613157437L; - @Override - protected List<ConnectorCapability> load() { - return Arrays.asList(ConnectorCapability.values()); - } - }; + @Override + protected List<ConnectorCapability> load() { + return Arrays.asList(ConnectorCapability.values()); + } + }; CheckBoxMultipleChoice<ConnectorCapability> capabilitiesPalette = new CheckBoxMultipleChoice<>( "capabilitiesPalette", new PropertyModel<List<ConnectorCapability>>(this, "selectedCapabilities"), capabilities); http://git-wip-us.apache.org/repos/asf/syncope/blob/016b441a/client/console/src/main/java/org/apache/syncope/client/console/topology/Topology.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/topology/Topology.java b/client/console/src/main/java/org/apache/syncope/client/console/topology/Topology.java index 5723859..5ec882c 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/topology/Topology.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/topology/Topology.java @@ -79,41 +79,40 @@ public class Topology extends BasePage { private static final int RESOURCE_MODAL_WIN_WIDTH = 1000; - final ModalWindow modal; + private final ModalWindow modal; - private final LoadableDetachableModel<List<ResourceTO>> resModel - = new LoadableDetachableModel<List<ResourceTO>>() { + private final LoadableDetachableModel<List<ResourceTO>> resModel = new LoadableDetachableModel<List<ResourceTO>>() { - private static final long serialVersionUID = 5275935387613157431L; + private static final long serialVersionUID = 5275935387613157431L; - @Override - protected List<ResourceTO> load() { - final List<ResourceTO> result = resourceRestClient.getAll(); - return result; - } - }; - - private final LoadableDetachableModel<Pair<List<ConnInstanceTO>, List<ConnInstanceTO>>> connModel - = new LoadableDetachableModel<Pair<List<ConnInstanceTO>, List<ConnInstanceTO>>>() { - - private static final long serialVersionUID = 5275935387613157432L; + @Override + protected List<ResourceTO> load() { + final List<ResourceTO> result = resourceRestClient.getAll(); + return result; + } + }; - @Override - protected Pair<List<ConnInstanceTO>, List<ConnInstanceTO>> load() { - final List<ConnInstanceTO> level1 = new ArrayList<>(); - final List<ConnInstanceTO> level2 = new ArrayList<>(); + private final LoadableDetachableModel<Pair<List<ConnInstanceTO>, List<ConnInstanceTO>>> connModel = + new LoadableDetachableModel<Pair<List<ConnInstanceTO>, List<ConnInstanceTO>>>() { - for (ConnInstanceTO conn : connectorRestClient.getAllConnectors()) { - if (conn.getLocation().startsWith(CONNECTOR_SERVER_LOCATION_PREFIX)) { - level2.add(conn); - } else { - level1.add(conn); - } - } + private static final long serialVersionUID = 5275935387613157432L; - return Pair.of(level1, level2); + @Override + protected Pair<List<ConnInstanceTO>, List<ConnInstanceTO>> load() { + final List<ConnInstanceTO> level1 = new ArrayList<>(); + final List<ConnInstanceTO> level2 = new ArrayList<>(); + + for (ConnInstanceTO conn : connectorRestClient.getAllConnectors()) { + if (conn.getLocation().startsWith(CONNECTOR_SERVER_LOCATION_PREFIX)) { + level2.add(conn); + } else { + level1.add(conn); } - }; + } + + return Pair.of(level1, level2); + } + }; private final LoadableDetachableModel<List<URI>> csModel = new LoadableDetachableModel<List<URI>>() { @@ -215,7 +214,6 @@ public class Topology extends BasePage { public void onClick(final AjaxRequestTarget target) { target.appendJavaScript("zoomIn($('#drawing')[0]);"); } - }, ActionLink.ActionType.ZOOM_IN, Entitlement.RESOURCE_LIST).add(new ActionLink() { private static final long serialVersionUID = -3722207913631435501L; @@ -291,103 +289,101 @@ public class Topology extends BasePage { // ----------------------------------------- // Add Connector Intances (first level) // ----------------------------------------- - final ListView<ConnInstanceTO> conn1 - = new ListView<ConnInstanceTO>("conn1", connModel.getObject().getLeft()) { + final ListView<ConnInstanceTO> conn1 = new ListView<ConnInstanceTO>("conn1", connModel.getObject().getLeft()) { - private static final long serialVersionUID = 6978621871488360381L; + private static final long serialVersionUID = 6978621871488360381L; - private final int size = connModel.getObject().getLeft().size() + 1; + private final int size = connModel.getObject().getLeft().size() + 1; - @Override - protected void populateItem(final ListItem<ConnInstanceTO> item) { - int kx = size >= 6 ? 800 : (130 * size); + @Override + protected void populateItem(final ListItem<ConnInstanceTO> item) { + int kx = size >= 6 ? 800 : (130 * size); - int x = (int) Math.round(origX + kx * Math.cos(Math.PI * (item.getIndex() + 1) / size)); - int y = (int) Math.round(origY + 100 * Math.sin(Math.PI * (item.getIndex() + 1) / size)); + int x = (int) Math.round(origX + kx * Math.cos(Math.PI * (item.getIndex() + 1) / size)); + int y = (int) Math.round(origY + 100 * Math.sin(Math.PI * (item.getIndex() + 1) / size)); - final ConnInstanceTO conn = item.getModelObject(); - final TopologyNode topologynode = new TopologyNode( - Long.valueOf(conn.getKey()), conn.getDisplayName(), TopologyNode.Kind.CONNECTOR); - topologynode.setConnectinDisplayName(conn.getBundleName()); - topologynode.setX(x); - topologynode.setY(y); + final ConnInstanceTO conn = item.getModelObject(); + final TopologyNode topologynode = new TopologyNode( + Long.valueOf(conn.getKey()), conn.getDisplayName(), TopologyNode.Kind.CONNECTOR); + topologynode.setConnectinDisplayName(conn.getBundleName()); + topologynode.setX(x); + topologynode.setY(y); - connectors.put(Long.class.cast(topologynode.getKey()), topologynode); + connectors.put(Long.class.cast(topologynode.getKey()), topologynode); - item.add(topologyNodePanel("conn", topologynode)); + item.add(topologyNodePanel("conn", topologynode)); - if (conn.getLocation().startsWith(CONNECTOR_SERVER_LOCATION_PREFIX)) { - final Map<Serializable, TopologyNode> remoteConnections; + if (conn.getLocation().startsWith(CONNECTOR_SERVER_LOCATION_PREFIX)) { + final Map<Serializable, TopologyNode> remoteConnections; - if (connections.containsKey(conn.getLocation())) { - remoteConnections = connections.get(conn.getLocation()); - } else { - remoteConnections = new HashMap<>(); - connections.put(conn.getLocation(), remoteConnections); - } - remoteConnections.put(conn.getKey(), topologynode); - } else { - syncopeConnections.put(conn.getKey(), topologynode); - } + if (connections.containsKey(conn.getLocation())) { + remoteConnections = connections.get(conn.getLocation()); + } else { + remoteConnections = new HashMap<>(); + connections.put(conn.getLocation(), remoteConnections); } - }; + remoteConnections.put(conn.getKey(), topologynode); + } else { + syncopeConnections.put(conn.getKey(), topologynode); + } + } + }; conn1.setOutputMarkupId(true); add(conn1); - // ----------------------------------------- + // ----------------------------------------- // ----------------------------------------- // Add Connector Intances (second level) // ----------------------------------------- - final ListView<ConnInstanceTO> conn2 - = new ListView<ConnInstanceTO>("conn2", connModel.getObject().getRight()) { + final ListView<ConnInstanceTO> conn2 = new ListView<ConnInstanceTO>("conn2", connModel.getObject().getRight()) { - private static final long serialVersionUID = 6978621871488360381L; + private static final long serialVersionUID = 6978621871488360381L; - private final int size = connModel.getObject().getRight().size() + 1; + private final int size = connModel.getObject().getRight().size() + 1; - @Override - protected void populateItem(final ListItem<ConnInstanceTO> item) { - final ConnInstanceTO conn = item.getModelObject(); + @Override + protected void populateItem(final ListItem<ConnInstanceTO> item) { + final ConnInstanceTO conn = item.getModelObject(); - final TopologyNode parent = servers.get(conn.getLocation()); + final TopologyNode parent = servers.get(conn.getLocation()); - int kx = size >= 6 ? 800 : (130 * size); + int kx = size >= 6 ? 800 : (130 * size); - int x = (int) Math.round((parent == null ? origX : parent.getX()) - + kx * Math.cos(Math.PI + Math.PI * (item.getIndex() + 1) / size)); - int y = (int) Math.round((parent == null ? origY : parent.getY()) - + 100 * Math.sin(Math.PI + Math.PI * (item.getIndex() + 1) / size)); + int x = (int) Math.round((parent == null ? origX : parent.getX()) + + kx * Math.cos(Math.PI + Math.PI * (item.getIndex() + 1) / size)); + int y = (int) Math.round((parent == null ? origY : parent.getY()) + + 100 * Math.sin(Math.PI + Math.PI * (item.getIndex() + 1) / size)); - final TopologyNode topologynode = new TopologyNode( - Long.valueOf(conn.getKey()), conn.getDisplayName(), TopologyNode.Kind.CONNECTOR); - topologynode.setConnectinDisplayName(conn.getBundleName()); - topologynode.setX(x); - topologynode.setY(y); + final TopologyNode topologynode = new TopologyNode( + Long.valueOf(conn.getKey()), conn.getDisplayName(), TopologyNode.Kind.CONNECTOR); + topologynode.setConnectinDisplayName(conn.getBundleName()); + topologynode.setX(x); + topologynode.setY(y); - connectors.put(Long.class.cast(topologynode.getKey()), topologynode); + connectors.put(Long.class.cast(topologynode.getKey()), topologynode); - item.add(topologyNodePanel("conn", topologynode)); + item.add(topologyNodePanel("conn", topologynode)); - if (conn.getLocation().startsWith(CONNECTOR_SERVER_LOCATION_PREFIX)) { - final Map<Serializable, TopologyNode> remoteConnections; + if (conn.getLocation().startsWith(CONNECTOR_SERVER_LOCATION_PREFIX)) { + final Map<Serializable, TopologyNode> remoteConnections; - if (connections.containsKey(conn.getLocation())) { - remoteConnections = connections.get(conn.getLocation()); - } else { - remoteConnections = new HashMap<>(); - connections.put(conn.getLocation(), remoteConnections); - } - remoteConnections.put(conn.getKey(), topologynode); - } else { - syncopeConnections.put(conn.getKey(), topologynode); - } + if (connections.containsKey(conn.getLocation())) { + remoteConnections = connections.get(conn.getLocation()); + } else { + remoteConnections = new HashMap<>(); + connections.put(conn.getLocation(), remoteConnections); } - }; + remoteConnections.put(conn.getKey(), topologynode); + } else { + syncopeConnections.put(conn.getKey(), topologynode); + } + } + }; conn2.setOutputMarkupId(true); add(conn2); - // ----------------------------------------- + // ----------------------------------------- // ----------------------------------------- // Add Resources @@ -426,37 +422,37 @@ public class Topology extends BasePage { final ListView<TopologyNode> innerListView = new ListView<TopologyNode>("resources", new ArrayList<>(connections.get(connectorId).values())) { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; - private final int size = getModelObject().size() + 1; + private final int size = getModelObject().size() + 1; - @Override - protected void populateItem(final ListItem<TopologyNode> item) { - final TopologyNode topologynode = item.getModelObject(); - final TopologyNode parent = connectors.get(connectorId); + @Override + protected void populateItem(final ListItem<TopologyNode> item) { + final TopologyNode topologynode = item.getModelObject(); + final TopologyNode parent = connectors.get(connectorId); - final double k; + final double k; - if (parent == null || parent.getY() < syncopeTopologyNode.getY()) { - k = Math.PI; - } else { - k = 0.0; - } + if (parent == null || parent.getY() < syncopeTopologyNode.getY()) { + k = Math.PI; + } else { + k = 0.0; + } - int kx = size >= 16 ? 800 : (48 * size); - int ky = size < 4 ? 100 : size < 6 ? 350 : 750; + int kx = size >= 16 ? 800 : (48 * size); + int ky = size < 4 ? 100 : size < 6 ? 350 : 750; - int x = (int) Math.round((parent == null ? origX : parent.getX()) - + kx * Math.cos(k + Math.PI * (item.getIndex() + 1) / size)); - int y = (int) Math.round((parent == null ? origY : parent.getY()) - + ky * Math.sin(k + Math.PI * (item.getIndex() + 1) / size)); + int x = (int) Math.round((parent == null ? origX : parent.getX()) + + kx * Math.cos(k + Math.PI * (item.getIndex() + 1) / size)); + int y = (int) Math.round((parent == null ? origY : parent.getY()) + + ky * Math.sin(k + Math.PI * (item.getIndex() + 1) / size)); - topologynode.setX(x); - topologynode.setY(y); + topologynode.setX(x); + topologynode.setY(y); - item.add(topologyNodePanel("res", topologynode)); - } - }; + item.add(topologyNodePanel("res", topologynode)); + } + }; innerListView.setOutputMarkupId(true); item.add(innerListView); http://git-wip-us.apache.org/repos/asf/syncope/blob/016b441a/client/console/src/main/java/org/apache/syncope/client/console/topology/TopologyNodePanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/topology/TopologyNodePanel.java b/client/console/src/main/java/org/apache/syncope/client/console/topology/TopologyNodePanel.java index ab8ebc2..478260e 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/topology/TopologyNodePanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/topology/TopologyNodePanel.java @@ -46,7 +46,7 @@ public class TopologyNodePanel extends Panel { protected static final Logger LOG = LoggerFactory.getLogger(TopologyNodePanel.class); - final ModalWindow modal; + private final ModalWindow modal; @SpringBean private ResourceRestClient resourceRestClient;
