From 82b1c027fa407dcdeaae4676c91681e3cdd9fa6c Mon Sep 17 00:00:00 2001 From: donald.g.dunne Date: Wed, 23 Dec 2015 12:54:49 -0700 Subject: refinement: Re-Organize, Format and Cleanup source Change-Id: I71e686df3d68f22622f492a8dc0c168b4adc5c4d --- .../hazelcast/internal/ClusterEventNotifier.java | 12 +++---- .../cluster/hazelcast/internal/ClusterProxy.java | 2 +- .../hazelcast/internal/ClusterServiceImpl.java | 38 +++++++++++----------- .../internal/DistributedExecutorServiceImpl.java | 6 ++-- .../hazelcast/internal/DistributedMapProxy.java | 2 +- 5 files changed, 30 insertions(+), 30 deletions(-) (limited to 'plugins/org.eclipse.osee.cluster.hazelcast') diff --git a/plugins/org.eclipse.osee.cluster.hazelcast/src/org/eclipse/osee/cluster/hazelcast/internal/ClusterEventNotifier.java b/plugins/org.eclipse.osee.cluster.hazelcast/src/org/eclipse/osee/cluster/hazelcast/internal/ClusterEventNotifier.java index 5bace119587..e93491379d5 100644 --- a/plugins/org.eclipse.osee.cluster.hazelcast/src/org/eclipse/osee/cluster/hazelcast/internal/ClusterEventNotifier.java +++ b/plugins/org.eclipse.osee.cluster.hazelcast/src/org/eclipse/osee/cluster/hazelcast/internal/ClusterEventNotifier.java @@ -10,12 +10,6 @@ *******************************************************************************/ package org.eclipse.osee.cluster.hazelcast.internal; -import java.util.Map; -import org.eclipse.osee.cluster.ClusterConstants; -import org.eclipse.osee.cluster.ClusterServiceUtils; -import org.eclipse.osee.cluster.Member; -import org.eclipse.osee.cluster.ClusterConstants.ClusterInstanceState; -import org.eclipse.osee.event.EventService; import com.hazelcast.core.Instance; import com.hazelcast.core.Instance.InstanceType; import com.hazelcast.core.InstanceEvent; @@ -25,6 +19,12 @@ import com.hazelcast.core.LifecycleEvent.LifecycleState; import com.hazelcast.core.LifecycleListener; import com.hazelcast.core.MembershipEvent; import com.hazelcast.core.MembershipListener; +import java.util.Map; +import org.eclipse.osee.cluster.ClusterConstants; +import org.eclipse.osee.cluster.ClusterConstants.ClusterInstanceState; +import org.eclipse.osee.cluster.ClusterServiceUtils; +import org.eclipse.osee.cluster.Member; +import org.eclipse.osee.event.EventService; /** * @author Roberto E. Escobar diff --git a/plugins/org.eclipse.osee.cluster.hazelcast/src/org/eclipse/osee/cluster/hazelcast/internal/ClusterProxy.java b/plugins/org.eclipse.osee.cluster.hazelcast/src/org/eclipse/osee/cluster/hazelcast/internal/ClusterProxy.java index 39e0ad65e02..21cb5c016fd 100644 --- a/plugins/org.eclipse.osee.cluster.hazelcast/src/org/eclipse/osee/cluster/hazelcast/internal/ClusterProxy.java +++ b/plugins/org.eclipse.osee.cluster.hazelcast/src/org/eclipse/osee/cluster/hazelcast/internal/ClusterProxy.java @@ -10,11 +10,11 @@ *******************************************************************************/ package org.eclipse.osee.cluster.hazelcast.internal; +import com.hazelcast.core.HazelcastInstance; import java.util.HashSet; import java.util.Set; import org.eclipse.osee.cluster.Cluster; import org.eclipse.osee.cluster.Member; -import com.hazelcast.core.HazelcastInstance; /** * @author Roberto E. Escobar diff --git a/plugins/org.eclipse.osee.cluster.hazelcast/src/org/eclipse/osee/cluster/hazelcast/internal/ClusterServiceImpl.java b/plugins/org.eclipse.osee.cluster.hazelcast/src/org/eclipse/osee/cluster/hazelcast/internal/ClusterServiceImpl.java index 352f8b2737e..008eb847e16 100644 --- a/plugins/org.eclipse.osee.cluster.hazelcast/src/org/eclipse/osee/cluster/hazelcast/internal/ClusterServiceImpl.java +++ b/plugins/org.eclipse.osee.cluster.hazelcast/src/org/eclipse/osee/cluster/hazelcast/internal/ClusterServiceImpl.java @@ -10,6 +10,23 @@ *******************************************************************************/ package org.eclipse.osee.cluster.hazelcast.internal; +import com.hazelcast.config.Config; +import com.hazelcast.config.UrlXmlConfig; +import com.hazelcast.config.XmlConfigBuilder; +import com.hazelcast.core.Hazelcast; +import com.hazelcast.core.HazelcastInstance; +import com.hazelcast.core.IList; +import com.hazelcast.core.ILock; +import com.hazelcast.core.IMap; +import com.hazelcast.core.IQueue; +import com.hazelcast.core.ISet; +import com.hazelcast.core.IdGenerator; +import com.hazelcast.core.Instance; +import com.hazelcast.core.InstanceEvent; +import com.hazelcast.core.InstanceListener; +import com.hazelcast.core.LifecycleService; +import com.hazelcast.core.MultiMap; +import com.hazelcast.impl.GroupProperties; import java.io.IOException; import java.lang.reflect.Constructor; import java.util.List; @@ -34,23 +51,6 @@ import org.eclipse.osee.distributed.DistributedObject; import org.eclipse.osee.distributed.InstanceManager; import org.eclipse.osee.event.EventService; import org.eclipse.osee.logger.Log; -import com.hazelcast.config.Config; -import com.hazelcast.config.UrlXmlConfig; -import com.hazelcast.config.XmlConfigBuilder; -import com.hazelcast.core.Hazelcast; -import com.hazelcast.core.HazelcastInstance; -import com.hazelcast.core.IList; -import com.hazelcast.core.ILock; -import com.hazelcast.core.IMap; -import com.hazelcast.core.IQueue; -import com.hazelcast.core.ISet; -import com.hazelcast.core.IdGenerator; -import com.hazelcast.core.Instance; -import com.hazelcast.core.InstanceEvent; -import com.hazelcast.core.InstanceListener; -import com.hazelcast.core.LifecycleService; -import com.hazelcast.core.MultiMap; -import com.hazelcast.impl.GroupProperties; /** * @author Roberto E. Escobar @@ -112,7 +112,7 @@ public class ClusterServiceImpl implements ClusterService, InstanceManager { try { // URL configURL = new URL(configPath); // stream = new BufferedInputStream(configURL.openStream()); - // + // // XmlConfigBuilder builder = new XmlConfigBuilder(stream); return new UrlXmlConfig(configPath); } catch (IOException ex) { @@ -122,7 +122,7 @@ public class ClusterServiceImpl implements ClusterService, InstanceManager { // try { // stream.close(); // } catch (IOException ex) { - // // Do Nothing + // // Do Nothing // } // } } diff --git a/plugins/org.eclipse.osee.cluster.hazelcast/src/org/eclipse/osee/cluster/hazelcast/internal/DistributedExecutorServiceImpl.java b/plugins/org.eclipse.osee.cluster.hazelcast/src/org/eclipse/osee/cluster/hazelcast/internal/DistributedExecutorServiceImpl.java index 85b23a4711d..66f57905f85 100644 --- a/plugins/org.eclipse.osee.cluster.hazelcast/src/org/eclipse/osee/cluster/hazelcast/internal/DistributedExecutorServiceImpl.java +++ b/plugins/org.eclipse.osee.cluster.hazelcast/src/org/eclipse/osee/cluster/hazelcast/internal/DistributedExecutorServiceImpl.java @@ -10,6 +10,9 @@ *******************************************************************************/ package org.eclipse.osee.cluster.hazelcast.internal; +import com.hazelcast.core.DistributedTask; +import com.hazelcast.core.ExecutionCallback; +import com.hazelcast.core.HazelcastInstance; import java.util.Collection; import java.util.HashSet; import java.util.List; @@ -23,9 +26,6 @@ import java.util.concurrent.TimeoutException; import org.eclipse.osee.cluster.Callback; import org.eclipse.osee.cluster.DistributedExecutorService; import org.eclipse.osee.cluster.Member; -import com.hazelcast.core.DistributedTask; -import com.hazelcast.core.ExecutionCallback; -import com.hazelcast.core.HazelcastInstance; /** * @author Roberto E. Escobar diff --git a/plugins/org.eclipse.osee.cluster.hazelcast/src/org/eclipse/osee/cluster/hazelcast/internal/DistributedMapProxy.java b/plugins/org.eclipse.osee.cluster.hazelcast/src/org/eclipse/osee/cluster/hazelcast/internal/DistributedMapProxy.java index 3a27c6001b3..3df21ac10fe 100644 --- a/plugins/org.eclipse.osee.cluster.hazelcast/src/org/eclipse/osee/cluster/hazelcast/internal/DistributedMapProxy.java +++ b/plugins/org.eclipse.osee.cluster.hazelcast/src/org/eclipse/osee/cluster/hazelcast/internal/DistributedMapProxy.java @@ -10,6 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.cluster.hazelcast.internal; +import com.hazelcast.core.MapEntry; import java.util.Collection; import java.util.Map; import java.util.Set; @@ -18,7 +19,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import org.eclipse.osee.distributed.DistributedMap; import org.eclipse.osee.distributed.Predicate; -import com.hazelcast.core.MapEntry; /** * @author Roberto E. Escobar -- cgit v1.2.3