You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2014/12/05 11:03:03 UTC
[02/32] incubator-ignite git commit: # Renaming
# 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/9731a029
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9731a029
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9731a029
Branch: refs/heads/master
Commit: 9731a029ebc306519bf44671d303e87336f91bd0
Parents: cd99e62
Author: sboikov <sb...@gridgain.com>
Authored: Fri Dec 5 12:34:29 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Dec 5 12:34:29 2014 +0300
----------------------------------------------------------------------
.../cluster/GridEmptyProjectionException.java | 48 ++++++++++++++++++++
.../grid/GridEmptyProjectionException.java | 48 --------------------
.../util/future/GridFutureAdapterSelfTest.java | 1 +
.../scalar/pimps/ScalarProjectionPimp.scala | 2 +-
.../visor/commands/ack/VisorAckCommand.scala | 1 +
.../visor/commands/gc/VisorGcCommand.scala | 2 +-
.../main/scala/org/gridgain/visor/visor.scala | 2 +-
7 files changed, 53 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9731a029/modules/core/src/main/java/org/apache/ignite/cluster/GridEmptyProjectionException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cluster/GridEmptyProjectionException.java b/modules/core/src/main/java/org/apache/ignite/cluster/GridEmptyProjectionException.java
new file mode 100644
index 0000000..43d1794
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/cluster/GridEmptyProjectionException.java
@@ -0,0 +1,48 @@
+/* @java.file.header */
+
+/* _________ _____ __________________ _____
+ * __ ____/___________(_)______ /__ ____/______ ____(_)_______
+ * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
+ * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
+ * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
+ */
+
+package org.apache.ignite.cluster;
+
+import org.apache.ignite.cluster.*;
+import org.jetbrains.annotations.*;
+
+/**
+ * This exception defines illegal call on empty projection. Thrown by projection when operation
+ * that requires at least one node is called on empty projection.
+ */
+public class GridEmptyProjectionException extends GridTopologyException {
+ /** */
+ private static final long serialVersionUID = 0L;
+
+ /**
+ * Creates new exception with default error message.
+ */
+ public GridEmptyProjectionException() {
+ super("Grid projection is empty.");
+ }
+
+ /**
+ * Creates new exception with given error message.
+ *
+ * @param msg Error message.
+ */
+ public GridEmptyProjectionException(String msg) {
+ super(msg);
+ }
+
+ /**
+ * Creates a new exception with given error message and optional nested cause exception.
+ *
+ * @param msg Error message.
+ * @param cause Optional nested exception (can be {@code null}).
+ */
+ public GridEmptyProjectionException(String msg, @Nullable Throwable cause) {
+ super(msg, cause);
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9731a029/modules/core/src/main/java/org/gridgain/grid/GridEmptyProjectionException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/GridEmptyProjectionException.java b/modules/core/src/main/java/org/gridgain/grid/GridEmptyProjectionException.java
deleted file mode 100644
index 9a06c71..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/GridEmptyProjectionException.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/* @java.file.header */
-
-/* _________ _____ __________________ _____
- * __ ____/___________(_)______ /__ ____/______ ____(_)_______
- * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
- * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
- * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
- */
-
-package org.gridgain.grid;
-
-import org.apache.ignite.cluster.*;
-import org.jetbrains.annotations.*;
-
-/**
- * This exception defines illegal call on empty projection. Thrown by projection when operation
- * that requires at least one node is called on empty projection.
- */
-public class GridEmptyProjectionException extends GridTopologyException {
- /** */
- private static final long serialVersionUID = 0L;
-
- /**
- * Creates new exception with default error message.
- */
- public GridEmptyProjectionException() {
- super("Grid projection is empty.");
- }
-
- /**
- * Creates new exception with given error message.
- *
- * @param msg Error message.
- */
- public GridEmptyProjectionException(String msg) {
- super(msg);
- }
-
- /**
- * Creates a new exception with given error message and optional nested cause exception.
- *
- * @param msg Error message.
- * @param cause Optional nested exception (can be {@code null}).
- */
- public GridEmptyProjectionException(String msg, @Nullable Throwable cause) {
- super(msg, cause);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9731a029/modules/core/src/test/java/org/gridgain/grid/util/future/GridFutureAdapterSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/util/future/GridFutureAdapterSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/util/future/GridFutureAdapterSelfTest.java
index c6c8680..43e6ffd 100644
--- a/modules/core/src/test/java/org/gridgain/grid/util/future/GridFutureAdapterSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/util/future/GridFutureAdapterSelfTest.java
@@ -9,6 +9,7 @@
package org.gridgain.grid.util.future;
+import org.apache.ignite.cluster.*;
import org.apache.ignite.lang.*;
import org.gridgain.grid.*;
import org.gridgain.grid.kernal.processors.closure.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9731a029/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/ScalarProjectionPimp.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/ScalarProjectionPimp.scala b/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/ScalarProjectionPimp.scala
index 325e63a..00a1fd4 100644
--- a/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/ScalarProjectionPimp.scala
+++ b/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/ScalarProjectionPimp.scala
@@ -11,7 +11,7 @@
package org.gridgain.scalar.pimps
-import org.apache.ignite.cluster.{ClusterGroup, ClusterNode}
+import org.apache.ignite.cluster.{GridEmptyProjectionException, ClusterGroup, ClusterNode}
import org.apache.ignite.lang.{IgniteFutureCancelledException, IgniteFuture, IgnitePredicate}
import org.gridgain.grid._
import org.jetbrains.annotations._
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9731a029/modules/visor-console/src/main/scala/org/gridgain/visor/commands/ack/VisorAckCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/gridgain/visor/commands/ack/VisorAckCommand.scala b/modules/visor-console/src/main/scala/org/gridgain/visor/commands/ack/VisorAckCommand.scala
index 021def6..f86b696 100644
--- a/modules/visor-console/src/main/scala/org/gridgain/visor/commands/ack/VisorAckCommand.scala
+++ b/modules/visor-console/src/main/scala/org/gridgain/visor/commands/ack/VisorAckCommand.scala
@@ -11,6 +11,7 @@
package org.gridgain.visor.commands.ack
+import org.apache.ignite.cluster.GridEmptyProjectionException
import org.gridgain.grid._
import org.gridgain.grid.kernal.visor.misc.VisorAckTask
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9731a029/modules/visor-console/src/main/scala/org/gridgain/visor/commands/gc/VisorGcCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/gridgain/visor/commands/gc/VisorGcCommand.scala b/modules/visor-console/src/main/scala/org/gridgain/visor/commands/gc/VisorGcCommand.scala
index 6a74043..d51624b 100644
--- a/modules/visor-console/src/main/scala/org/gridgain/visor/commands/gc/VisorGcCommand.scala
+++ b/modules/visor-console/src/main/scala/org/gridgain/visor/commands/gc/VisorGcCommand.scala
@@ -11,7 +11,7 @@
package org.gridgain.visor.commands.gc
-import org.apache.ignite.cluster.ClusterNode
+import org.apache.ignite.cluster.{GridEmptyProjectionException, ClusterNode}
import org.gridgain.grid.kernal.visor.node.VisorNodeGcTask
import java.lang.{Boolean => JavaBoolean}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9731a029/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 142db0c..c4608b5 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
@@ -14,7 +14,7 @@ package org.gridgain.visor
import org.apache.ignite.lifecycle.IgniteListener
import org.apache.ignite.thread.IgniteThreadPoolExecutor
import org.apache.ignite.{IgniteSystemProperties, IgniteState, Ignition}
-import org.apache.ignite.cluster.{ClusterGroup, ClusterMetrics, ClusterNode}
+import org.apache.ignite.cluster.{GridEmptyProjectionException, ClusterGroup, ClusterMetrics, ClusterNode}
import org.apache.ignite.configuration.IgniteConfiguration
import org.apache.ignite.events.{IgniteEvent, IgniteDiscoveryEvent, IgniteEventType}
import org.apache.ignite.lang.IgnitePredicate