ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [05/11] incubator-ignite git commit: # Renaming
Date Fri, 05 Dec 2014 09:29:47 GMT
# Renaming


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0b43b173
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0b43b173
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0b43b173

Branch: refs/heads/master
Commit: 0b43b1737de74af7935a8c990658f1c96ae742ff
Parents: 8229484
Author: sboikov <sboikov@gridgain.com>
Authored: Fri Dec 5 12:19:07 2014 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Fri Dec 5 12:19:07 2014 +0300

----------------------------------------------------------------------
 .../java/org/apache/ignite/IgniteState.java     |  2 +-
 .../main/java/org/apache/ignite/Ignition.java   |  6 ++--
 .../startup/cmdline/CommandLineStartup.java     |  2 +-
 .../org/gridgain/grid/GridGainListener.java     | 29 --------------------
 .../java/org/gridgain/grid/IgniteListener.java  | 29 ++++++++++++++++++++
 .../org/gridgain/grid/kernal/GridGainEx.java    | 10 +++----
 .../cmdline/GridCommandLineLoaderTest.java      |  2 +-
 .../grid/kernal/GridFactoryVmShutdownTest.java  |  2 +-
 .../startup/GridRandomCommandLineLoader.java    |  2 +-
 .../grid/kernal/GridFactorySelfTest.java        |  4 +--
 .../main/scala/org/gridgain/visor/visor.scala   |  4 +--
 11 files changed, 46 insertions(+), 46 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b43b173/modules/core/src/main/java/org/apache/ignite/IgniteState.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteState.java b/modules/core/src/main/java/org/apache/ignite/IgniteState.java
index 7e849c0..347262a 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteState.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteState.java
@@ -14,7 +14,7 @@ import org.jetbrains.annotations.*;
 
 /**
  * Possible states of {@link org.apache.ignite.Ignition}. You can register a listener for
- * state change notifications via {@link org.apache.ignite.Ignition#addListener(org.gridgain.grid.GridGainListener)}
+ * state change notifications via {@link org.apache.ignite.Ignition#addListener(org.gridgain.grid.IgniteListener)}
  * method.
  */
 public enum IgniteState {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b43b173/modules/core/src/main/java/org/apache/ignite/Ignition.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/Ignition.java b/modules/core/src/main/java/org/apache/ignite/Ignition.java
index 55bcd52..18fa62d 100644
--- a/modules/core/src/main/java/org/apache/ignite/Ignition.java
+++ b/modules/core/src/main/java/org/apache/ignite/Ignition.java
@@ -393,17 +393,17 @@ public class Ignition {
      * @param lsnr Listener for grid life cycle events. If this listener was already added
      *      this method is no-op.
      */
-    public static void addListener(GridGainListener lsnr) {
+    public static void addListener(IgniteListener lsnr) {
         GridGainEx.addListener(lsnr);
     }
 
     /**
-     * Removes lsnr added by {@link #addListener(GridGainListener)} method.
+     * Removes lsnr added by {@link #addListener(org.gridgain.grid.IgniteListener)} method.
      *
      * @param lsnr Listener to remove.
      * @return {@code true} if lsnr was added before, {@code false} otherwise.
      */
-    public static boolean removeListener(GridGainListener lsnr) {
+    public static boolean removeListener(IgniteListener lsnr) {
         return GridGainEx.removeListener(lsnr);
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b43b173/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineStartup.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineStartup.java
b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineStartup.java
index 5f1dab0..0c21651 100644
--- a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineStartup.java
+++ b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineStartup.java
@@ -295,7 +295,7 @@ public final class CommandLineStartup {
         // Exit latch for the grid loaded from the command line.
         final CountDownLatch latch = new CountDownLatch(1);
 
-        G.addListener(new GridGainListener() {
+        G.addListener(new IgniteListener() {
             @Override public void onStateChange(String name, IgniteState state) {
                 // Skip all grids except loaded from the command line.
                 if (!F.eq(gridName, name))

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b43b173/modules/core/src/main/java/org/gridgain/grid/GridGainListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/GridGainListener.java b/modules/core/src/main/java/org/gridgain/grid/GridGainListener.java
deleted file mode 100644
index 498da87..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/GridGainListener.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid;
-
-import org.apache.ignite.*;
-import org.jetbrains.annotations.*;
-import java.util.*;
-
-/**
- * Listener for gird state change notifications. Use
- * {@link org.apache.ignite.Ignition#addListener(GridGainListener)} to register this
- * listener with grid factory.
- */
-public interface GridGainListener extends EventListener {
-    /**
-     * Listener for grid factory state change notifications.
-     *
-     * @param name Grid name ({@code null} for default un-named grid).
-     * @param state New state.
-     */
-    public void onStateChange(@Nullable String name, IgniteState state);
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b43b173/modules/core/src/main/java/org/gridgain/grid/IgniteListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/IgniteListener.java b/modules/core/src/main/java/org/gridgain/grid/IgniteListener.java
new file mode 100644
index 0000000..272fffb
--- /dev/null
+++ b/modules/core/src/main/java/org/gridgain/grid/IgniteListener.java
@@ -0,0 +1,29 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.gridgain.grid;
+
+import org.apache.ignite.*;
+import org.jetbrains.annotations.*;
+import java.util.*;
+
+/**
+ * Listener for gird state change notifications. Use
+ * {@link org.apache.ignite.Ignition#addListener(IgniteListener)} to register this
+ * listener with grid factory.
+ */
+public interface IgniteListener extends EventListener {
+    /**
+     * Listener for grid factory state change notifications.
+     *
+     * @param name Grid name ({@code null} for default un-named grid).
+     * @param state New state.
+     */
+    public void onStateChange(@Nullable String name, IgniteState state);
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b43b173/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java
index 233f726..6d9218b 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java
@@ -120,7 +120,7 @@ public class GridGainEx {
     private static volatile IgniteState dfltGridState;
 
     /** List of state listeners. */
-    private static final Collection<GridGainListener> lsnrs = new GridConcurrentHashSet<>(4);
+    private static final Collection<IgniteListener> lsnrs = new GridConcurrentHashSet<>(4);
 
     /** */
     private static volatile boolean daemon;
@@ -978,19 +978,19 @@ public class GridGainEx {
      * @param lsnr Listener for grid life cycle events. If this listener was already added
      *      this method is no-op.
      */
-    public static void addListener(GridGainListener lsnr) {
+    public static void addListener(IgniteListener lsnr) {
         A.notNull(lsnr, "lsnr");
 
         lsnrs.add(lsnr);
     }
 
     /**
-     * Removes lsnr added by {@link #addListener(GridGainListener)} method.
+     * Removes lsnr added by {@link #addListener(org.gridgain.grid.IgniteListener)} method.
      *
      * @param lsnr Listener to remove.
      * @return {@code true} if lsnr was added before, {@code false} otherwise.
      */
-    public static boolean removeListener(GridGainListener lsnr) {
+    public static boolean removeListener(IgniteListener lsnr) {
         A.notNull(lsnr, "lsnr");
 
         return lsnrs.remove(lsnr);
@@ -1006,7 +1006,7 @@ public class GridGainEx {
         else
             dfltGridState = state;
 
-        for (GridGainListener lsnr : lsnrs)
+        for (IgniteListener lsnr : lsnrs)
             lsnr.onStateChange(gridName, state);
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b43b173/modules/core/src/test/java/org/apache/ignite/startup/cmdline/GridCommandLineLoaderTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/startup/cmdline/GridCommandLineLoaderTest.java
b/modules/core/src/test/java/org/apache/ignite/startup/cmdline/GridCommandLineLoaderTest.java
index acae15b..86f054b 100644
--- a/modules/core/src/test/java/org/apache/ignite/startup/cmdline/GridCommandLineLoaderTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/startup/cmdline/GridCommandLineLoaderTest.java
@@ -42,7 +42,7 @@ public class GridCommandLineLoaderTest extends GridCommonAbstractTest {
 
         info("Loading Grid from configuration file: " + path);
 
-        G.addListener(new GridGainListener() {
+        G.addListener(new IgniteListener() {
             @Override public void onStateChange(String name, IgniteState state) {
                 if (state == STARTED) {
                     info("Received started notification from grid: " + name);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b43b173/modules/core/src/test/java/org/gridgain/grid/kernal/GridFactoryVmShutdownTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridFactoryVmShutdownTest.java
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridFactoryVmShutdownTest.java
index d743c38..6f84500 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridFactoryVmShutdownTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridFactoryVmShutdownTest.java
@@ -37,7 +37,7 @@ public class GridFactoryVmShutdownTest {
     public static void main(String[] args) throws Exception {
         final ConcurrentMap<String, IgniteState> states = new ConcurrentHashMap<>();
 
-        G.addListener(new GridGainListener() {
+        G.addListener(new IgniteListener() {
             @Override public void onStateChange(@Nullable String name, IgniteState state)
{
                 if (state == STARTED) {
                     IgniteState state0 = states.put(maskNull(name), STARTED);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b43b173/modules/core/src/test/java/org/gridgain/startup/GridRandomCommandLineLoader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/startup/GridRandomCommandLineLoader.java
b/modules/core/src/test/java/org/gridgain/startup/GridRandomCommandLineLoader.java
index cf9a8fb..fccaa5e 100644
--- a/modules/core/src/test/java/org/gridgain/startup/GridRandomCommandLineLoader.java
+++ b/modules/core/src/test/java/org/gridgain/startup/GridRandomCommandLineLoader.java
@@ -216,7 +216,7 @@ public final class GridRandomCommandLineLoader {
         System.out.println("Minimum TTL: " + minTtl);
         System.out.println("Maximum TTL: " + maxTtl);
 
-        G.addListener(new GridGainListener() {
+        G.addListener(new IgniteListener() {
             @Override public void onStateChange(String name, IgniteState state) {
                 if (state == STOPPED && latch != null)
                     latch.countDown();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b43b173/modules/spring/src/test/java/org/gridgain/grid/kernal/GridFactorySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/gridgain/grid/kernal/GridFactorySelfTest.java
b/modules/spring/src/test/java/org/gridgain/grid/kernal/GridFactorySelfTest.java
index c693d83..8ec6171 100644
--- a/modules/spring/src/test/java/org/gridgain/grid/kernal/GridFactorySelfTest.java
+++ b/modules/spring/src/test/java/org/gridgain/grid/kernal/GridFactorySelfTest.java
@@ -216,7 +216,7 @@ public class GridFactorySelfTest extends GridCommonAbstractTest {
 
         final Object mux = new Object();
 
-        GridGainListener factoryLsnr = new GridGainListener() {
+        IgniteListener factoryLsnr = new IgniteListener() {
             @Override public void onStateChange(String name, IgniteState state) {
                 synchronized (mux) {
                     if ("grid-factory-test-1".equals(name))
@@ -349,7 +349,7 @@ public class GridFactorySelfTest extends GridCommonAbstractTest {
         final AtomicInteger startedCnt = new AtomicInteger();
         final AtomicInteger stoppedCnt = new AtomicInteger();
 
-        GridGainListener lsnr = new GridGainListener() {
+        IgniteListener lsnr = new IgniteListener() {
             @SuppressWarnings("StringEquality")
             @Override public void onStateChange(@Nullable String name, IgniteState state)
{
                 assert name == gridName;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b43b173/modules/visor-console/src/main/scala/org/gridgain/visor/visor.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/gridgain/visor/visor.scala b/modules/visor-console/src/main/scala/org/gridgain/visor/visor.scala
index 9f7e524..4cd093c 100644
--- a/modules/visor-console/src/main/scala/org/gridgain/visor/visor.scala
+++ b/modules/visor-console/src/main/scala/org/gridgain/visor/visor.scala
@@ -150,7 +150,7 @@ object visor extends VisorTag {
     private var nodeSegLsnr: IgnitePredicate[IgniteEvent] = null
 
     /** Node stop listener. */
-    private var nodeStopLsnr: GridGainListener = null
+    private var nodeStopLsnr: IgniteListener = null
 
     /** Visor copyright blurb. */
     private final val COPYRIGHT = GridProductImpl.COPYRIGHT
@@ -1700,7 +1700,7 @@ object visor extends VisorTag {
 
         grid.events().localListen(nodeSegLsnr, EVT_NODE_SEGMENTED)
 
-        nodeStopLsnr = new GridGainListener {
+        nodeStopLsnr = new IgniteListener {
             def onStateChange(name: String, state: IgniteState) {
                 if (name == grid.name && state == IgniteState.STOPPED) {
                     warn("Closing Visor console due to stopping of host grid instance.")


Mime
View raw message