From 4907fea08b79c938dd06ad4b29ecf1ce927d4cd7 Mon Sep 17 00:00:00 2001
From: Jeffrey Phillips Freeman <jeffrey.freeman@syncleus.com>
Date: Fri, 16 Sep 2011 00:48:49 -0400
Subject: [PATCH] CHECKPOINT: Refactored (moved) context packege into a event
sub-package
---
src/main/java/com/syncleus/dann/graph/Cloud.java | 2 +-
.../com/syncleus/dann/graph/MutableDirectedAdjacencyGraph.java | 2 +-
.../com/syncleus/dann/graph/MutableHyperAdjacencyGraph.java | 2 +-
.../syncleus/dann/graph/MutableRootedTreeAdjacencyGraph.java | 2 +-
.../com/syncleus/dann/graph/MutableTreeAdjacencyGraph.java | 2 +-
.../graph/{ => event}/context/AbstractContextGraphElement.java | 2 +-
.../dann/graph/{ => event}/context/AbstractContextNode.java | 2 +-
.../dann/graph/{ => event}/context/ContextCloudElement.java | 2 +-
.../dann/graph/{ => event}/context/ContextEdgeElement.java | 2 +-
.../dann/graph/{ => event}/context/ContextGraphEdge.java | 3 +--
.../dann/graph/{ => event}/context/ContextGraphElement.java | 2 +-
.../dann/graph/{ => event}/context/ContextGraphNode.java | 2 +-
.../dann/graph/{ => event}/context/ContextReporter.java | 2 +-
.../graph/{ => event}/context/InvalidContextException.java | 2 +-
.../graph/{ => event}/context/RejectedContextException.java | 2 +-
.../graphicalmodel/MutableGraphicalModelAdjacencyGraph.java | 2 +-
.../syncleus/dann/graphicalmodel/SimpleGraphicalModelNode.java | 2 +-
.../bayesian/MutableBayesianAdjacencyNetwork.java | 2 +-
.../dynamic/MutableDynamicGraphicalModelAdjacencyGraph.java | 2 +-
.../MutableMarkovRandomFieldAdjacencyGraph.java | 2 +-
20 files changed, 20 insertions(+), 21 deletions(-)
rename src/main/java/com/syncleus/dann/graph/{ => event}/context/AbstractContextGraphElement.java (98%)
rename src/main/java/com/syncleus/dann/graph/{ => event}/context/AbstractContextNode.java (98%)
rename src/main/java/com/syncleus/dann/graph/{ => event}/context/ContextCloudElement.java (97%)
rename src/main/java/com/syncleus/dann/graph/{ => event}/context/ContextEdgeElement.java (97%)
rename src/main/java/com/syncleus/dann/graph/{ => event}/context/ContextGraphEdge.java (95%)
rename src/main/java/com/syncleus/dann/graph/{ => event}/context/ContextGraphElement.java (97%)
rename src/main/java/com/syncleus/dann/graph/{ => event}/context/ContextGraphNode.java (97%)
rename src/main/java/com/syncleus/dann/graph/{ => event}/context/ContextReporter.java (97%)
rename src/main/java/com/syncleus/dann/graph/{ => event}/context/InvalidContextException.java (97%)
rename src/main/java/com/syncleus/dann/graph/{ => event}/context/RejectedContextException.java (97%)
diff --git a/src/main/java/com/syncleus/dann/graph/Cloud.java b/src/main/java/com/syncleus/dann/graph/Cloud.java
index 3f5befb2..cbd0158a 100644
--- a/src/main/java/com/syncleus/dann/graph/Cloud.java
+++ b/src/main/java/com/syncleus/dann/graph/Cloud.java
@@ -21,7 +21,7 @@ package com.syncleus.dann.graph;
import java.io.Serializable;
import java.util.Collection;
import java.util.Set;
-import com.syncleus.dann.graph.context.ContextReporter;
+import com.syncleus.dann.graph.event.context.ContextReporter;
import com.syncleus.dann.graph.xml.EdgeXml;
import com.syncleus.dann.xml.XmlSerializable;
diff --git a/src/main/java/com/syncleus/dann/graph/MutableDirectedAdjacencyGraph.java b/src/main/java/com/syncleus/dann/graph/MutableDirectedAdjacencyGraph.java
index 043473fb..6803f6e7 100644
--- a/src/main/java/com/syncleus/dann/graph/MutableDirectedAdjacencyGraph.java
+++ b/src/main/java/com/syncleus/dann/graph/MutableDirectedAdjacencyGraph.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import com.syncleus.dann.graph.context.ContextGraphNode;
+import com.syncleus.dann.graph.event.context.ContextGraphNode;
public class MutableDirectedAdjacencyGraph<N, E extends DirectedEdge<N>> extends AbstractDirectedAdjacencyGraph<N, E> implements MutableDirectedGraph<N, E>
{
diff --git a/src/main/java/com/syncleus/dann/graph/MutableHyperAdjacencyGraph.java b/src/main/java/com/syncleus/dann/graph/MutableHyperAdjacencyGraph.java
index b4fba619..cafca9b9 100644
--- a/src/main/java/com/syncleus/dann/graph/MutableHyperAdjacencyGraph.java
+++ b/src/main/java/com/syncleus/dann/graph/MutableHyperAdjacencyGraph.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import com.syncleus.dann.graph.context.ContextGraphNode;
+import com.syncleus.dann.graph.event.context.ContextGraphNode;
public class MutableHyperAdjacencyGraph<N, E extends HyperEdge<N>> extends AbstractHyperAdjacencyGraph<N, E> implements MutableHyperGraph<N, E>
{
diff --git a/src/main/java/com/syncleus/dann/graph/MutableRootedTreeAdjacencyGraph.java b/src/main/java/com/syncleus/dann/graph/MutableRootedTreeAdjacencyGraph.java
index d08a6b7a..2cde1c3c 100644
--- a/src/main/java/com/syncleus/dann/graph/MutableRootedTreeAdjacencyGraph.java
+++ b/src/main/java/com/syncleus/dann/graph/MutableRootedTreeAdjacencyGraph.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import com.syncleus.dann.graph.context.ContextGraphNode;
+import com.syncleus.dann.graph.event.context.ContextGraphNode;
public class MutableRootedTreeAdjacencyGraph<N, E extends DirectedEdge<N>> extends AbstractRootedTreeAdjacencyGraph<N, E> implements MutableRootedTreeGraph<N, E>
{
diff --git a/src/main/java/com/syncleus/dann/graph/MutableTreeAdjacencyGraph.java b/src/main/java/com/syncleus/dann/graph/MutableTreeAdjacencyGraph.java
index 939d81d6..dd3205a0 100644
--- a/src/main/java/com/syncleus/dann/graph/MutableTreeAdjacencyGraph.java
+++ b/src/main/java/com/syncleus/dann/graph/MutableTreeAdjacencyGraph.java
@@ -18,7 +18,7 @@
******************************************************************************/
package com.syncleus.dann.graph;
-import com.syncleus.dann.graph.context.ContextGraphNode;
+import com.syncleus.dann.graph.event.context.ContextGraphNode;
import com.syncleus.dann.graph.tree.Trees;
import java.util.ArrayList;
import java.util.HashSet;
diff --git a/src/main/java/com/syncleus/dann/graph/context/AbstractContextGraphElement.java b/src/main/java/com/syncleus/dann/graph/event/context/AbstractContextGraphElement.java
similarity index 98%
rename from src/main/java/com/syncleus/dann/graph/context/AbstractContextGraphElement.java
rename to src/main/java/com/syncleus/dann/graph/event/context/AbstractContextGraphElement.java
index 4cb385a6..e72f346d 100644
--- a/src/main/java/com/syncleus/dann/graph/context/AbstractContextGraphElement.java
+++ b/src/main/java/com/syncleus/dann/graph/event/context/AbstractContextGraphElement.java
@@ -16,7 +16,7 @@
* Philadelphia, PA 19148 *
* *
******************************************************************************/
-package com.syncleus.dann.graph.context;
+package com.syncleus.dann.graph.event.context;
import java.util.Collections;
import java.util.HashSet;
diff --git a/src/main/java/com/syncleus/dann/graph/context/AbstractContextNode.java b/src/main/java/com/syncleus/dann/graph/event/context/AbstractContextNode.java
similarity index 98%
rename from src/main/java/com/syncleus/dann/graph/context/AbstractContextNode.java
rename to src/main/java/com/syncleus/dann/graph/event/context/AbstractContextNode.java
index 0728f33e..27d61695 100644
--- a/src/main/java/com/syncleus/dann/graph/context/AbstractContextNode.java
+++ b/src/main/java/com/syncleus/dann/graph/event/context/AbstractContextNode.java
@@ -16,7 +16,7 @@
* Philadelphia, PA 19148 *
* *
******************************************************************************/
-package com.syncleus.dann.graph.context;
+package com.syncleus.dann.graph.event.context;
import java.util.Collections;
import java.util.HashSet;
diff --git a/src/main/java/com/syncleus/dann/graph/context/ContextCloudElement.java b/src/main/java/com/syncleus/dann/graph/event/context/ContextCloudElement.java
similarity index 97%
rename from src/main/java/com/syncleus/dann/graph/context/ContextCloudElement.java
rename to src/main/java/com/syncleus/dann/graph/event/context/ContextCloudElement.java
index 6648630c..c5fd04bb 100644
--- a/src/main/java/com/syncleus/dann/graph/context/ContextCloudElement.java
+++ b/src/main/java/com/syncleus/dann/graph/event/context/ContextCloudElement.java
@@ -16,7 +16,7 @@
* Philadelphia, PA 19148 *
* *
******************************************************************************/
-package com.syncleus.dann.graph.context;
+package com.syncleus.dann.graph.event.context;
import java.util.Set;
import com.syncleus.dann.graph.Cloud;
diff --git a/src/main/java/com/syncleus/dann/graph/context/ContextEdgeElement.java b/src/main/java/com/syncleus/dann/graph/event/context/ContextEdgeElement.java
similarity index 97%
rename from src/main/java/com/syncleus/dann/graph/context/ContextEdgeElement.java
rename to src/main/java/com/syncleus/dann/graph/event/context/ContextEdgeElement.java
index 4ba14295..5a5d10b1 100644
--- a/src/main/java/com/syncleus/dann/graph/context/ContextEdgeElement.java
+++ b/src/main/java/com/syncleus/dann/graph/event/context/ContextEdgeElement.java
@@ -16,7 +16,7 @@
* Philadelphia, PA 19148 *
* *
******************************************************************************/
-package com.syncleus.dann.graph.context;
+package com.syncleus.dann.graph.event.context;
import java.util.Set;
import com.syncleus.dann.graph.*;
diff --git a/src/main/java/com/syncleus/dann/graph/context/ContextGraphEdge.java b/src/main/java/com/syncleus/dann/graph/event/context/ContextGraphEdge.java
similarity index 95%
rename from src/main/java/com/syncleus/dann/graph/context/ContextGraphEdge.java
rename to src/main/java/com/syncleus/dann/graph/event/context/ContextGraphEdge.java
index 768dbbef..da1e5963 100644
--- a/src/main/java/com/syncleus/dann/graph/context/ContextGraphEdge.java
+++ b/src/main/java/com/syncleus/dann/graph/event/context/ContextGraphEdge.java
@@ -16,10 +16,9 @@
* Philadelphia, PA 19148 *
* *
******************************************************************************/
-package com.syncleus.dann.graph.context;
+package com.syncleus.dann.graph.event.context;
import java.util.Set;
-import com.syncleus.dann.graph.Cloud;
import com.syncleus.dann.graph.Graph;
public interface ContextGraphEdge< GEE extends Graph.EdgeEndpoint<?,?> >
diff --git a/src/main/java/com/syncleus/dann/graph/context/ContextGraphElement.java b/src/main/java/com/syncleus/dann/graph/event/context/ContextGraphElement.java
similarity index 97%
rename from src/main/java/com/syncleus/dann/graph/context/ContextGraphElement.java
rename to src/main/java/com/syncleus/dann/graph/event/context/ContextGraphElement.java
index 88a1498b..e69c9e5f 100644
--- a/src/main/java/com/syncleus/dann/graph/context/ContextGraphElement.java
+++ b/src/main/java/com/syncleus/dann/graph/event/context/ContextGraphElement.java
@@ -16,7 +16,7 @@
* Philadelphia, PA 19148 *
* *
******************************************************************************/
-package com.syncleus.dann.graph.context;
+package com.syncleus.dann.graph.event.context;
import java.util.Set;
import com.syncleus.dann.graph.Graph;
diff --git a/src/main/java/com/syncleus/dann/graph/context/ContextGraphNode.java b/src/main/java/com/syncleus/dann/graph/event/context/ContextGraphNode.java
similarity index 97%
rename from src/main/java/com/syncleus/dann/graph/context/ContextGraphNode.java
rename to src/main/java/com/syncleus/dann/graph/event/context/ContextGraphNode.java
index df1bd118..742772e9 100644
--- a/src/main/java/com/syncleus/dann/graph/context/ContextGraphNode.java
+++ b/src/main/java/com/syncleus/dann/graph/event/context/ContextGraphNode.java
@@ -16,7 +16,7 @@
* Philadelphia, PA 19148 *
* *
******************************************************************************/
-package com.syncleus.dann.graph.context;
+package com.syncleus.dann.graph.event.context;
import java.util.Set;
import com.syncleus.dann.graph.Graph;
diff --git a/src/main/java/com/syncleus/dann/graph/context/ContextReporter.java b/src/main/java/com/syncleus/dann/graph/event/context/ContextReporter.java
similarity index 97%
rename from src/main/java/com/syncleus/dann/graph/context/ContextReporter.java
rename to src/main/java/com/syncleus/dann/graph/event/context/ContextReporter.java
index 8399fa7a..ca1816e1 100644
--- a/src/main/java/com/syncleus/dann/graph/context/ContextReporter.java
+++ b/src/main/java/com/syncleus/dann/graph/event/context/ContextReporter.java
@@ -16,7 +16,7 @@
* Philadelphia, PA 19148 *
* *
******************************************************************************/
-package com.syncleus.dann.graph.context;
+package com.syncleus.dann.graph.event.context;
public interface ContextReporter
{
diff --git a/src/main/java/com/syncleus/dann/graph/context/InvalidContextException.java b/src/main/java/com/syncleus/dann/graph/event/context/InvalidContextException.java
similarity index 97%
rename from src/main/java/com/syncleus/dann/graph/context/InvalidContextException.java
rename to src/main/java/com/syncleus/dann/graph/event/context/InvalidContextException.java
index bbba5c74..a3dbc6df 100644
--- a/src/main/java/com/syncleus/dann/graph/context/InvalidContextException.java
+++ b/src/main/java/com/syncleus/dann/graph/event/context/InvalidContextException.java
@@ -16,7 +16,7 @@
* Philadelphia, PA 19148 *
* *
******************************************************************************/
-package com.syncleus.dann.graph.context;
+package com.syncleus.dann.graph.event.context;
//This class is a runtime class to encapsulate the RejectedContextException. This allows the context to be optional
//without having actions blocked by context events needing to explicitly handle exceptions (as you do with non-runtime
diff --git a/src/main/java/com/syncleus/dann/graph/context/RejectedContextException.java b/src/main/java/com/syncleus/dann/graph/event/context/RejectedContextException.java
similarity index 97%
rename from src/main/java/com/syncleus/dann/graph/context/RejectedContextException.java
rename to src/main/java/com/syncleus/dann/graph/event/context/RejectedContextException.java
index e43e93bc..c47ead3e 100644
--- a/src/main/java/com/syncleus/dann/graph/context/RejectedContextException.java
+++ b/src/main/java/com/syncleus/dann/graph/event/context/RejectedContextException.java
@@ -16,7 +16,7 @@
* Philadelphia, PA 19148 *
* *
******************************************************************************/
-package com.syncleus.dann.graph.context;
+package com.syncleus.dann.graph.event.context;
public class RejectedContextException extends Exception
{
diff --git a/src/main/java/com/syncleus/dann/graphicalmodel/MutableGraphicalModelAdjacencyGraph.java b/src/main/java/com/syncleus/dann/graphicalmodel/MutableGraphicalModelAdjacencyGraph.java
index acff9fb3..79b64d20 100644
--- a/src/main/java/com/syncleus/dann/graphicalmodel/MutableGraphicalModelAdjacencyGraph.java
+++ b/src/main/java/com/syncleus/dann/graphicalmodel/MutableGraphicalModelAdjacencyGraph.java
@@ -23,7 +23,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
import com.syncleus.dann.graph.BidirectedEdge;
-import com.syncleus.dann.graph.context.ContextGraphNode;
+import com.syncleus.dann.graph.event.context.ContextGraphNode;
import com.syncleus.dann.graph.Graph;
public class MutableGraphicalModelAdjacencyGraph<N extends GraphicalModelNode, E extends BidirectedEdge<N>> extends AbstractGraphicalModelAdjacencyGraph<N, E> implements MutableGraphicalModel<N, E>
diff --git a/src/main/java/com/syncleus/dann/graphicalmodel/SimpleGraphicalModelNode.java b/src/main/java/com/syncleus/dann/graphicalmodel/SimpleGraphicalModelNode.java
index b42f4b04..f37f5099 100644
--- a/src/main/java/com/syncleus/dann/graphicalmodel/SimpleGraphicalModelNode.java
+++ b/src/main/java/com/syncleus/dann/graphicalmodel/SimpleGraphicalModelNode.java
@@ -20,7 +20,7 @@ package com.syncleus.dann.graphicalmodel;
import java.util.*;
import com.syncleus.dann.graph.BidirectedEdge;
-import com.syncleus.dann.graph.context.AbstractContextNode;
+import com.syncleus.dann.graph.event.context.AbstractContextNode;
import com.syncleus.dann.graphicalmodel.xml.GraphicalModelNodeXml;
import com.syncleus.dann.graphicalmodel.xml.SimpleGraphicalModelNodeElementXml;
import com.syncleus.dann.graphicalmodel.xml.SimpleGraphicalModelNodeXml;
diff --git a/src/main/java/com/syncleus/dann/graphicalmodel/bayesian/MutableBayesianAdjacencyNetwork.java b/src/main/java/com/syncleus/dann/graphicalmodel/bayesian/MutableBayesianAdjacencyNetwork.java
index 20a731d5..937dd4c6 100644
--- a/src/main/java/com/syncleus/dann/graphicalmodel/bayesian/MutableBayesianAdjacencyNetwork.java
+++ b/src/main/java/com/syncleus/dann/graphicalmodel/bayesian/MutableBayesianAdjacencyNetwork.java
@@ -23,7 +23,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
import com.syncleus.dann.graph.DirectedEdge;
-import com.syncleus.dann.graph.context.ContextGraphNode;
+import com.syncleus.dann.graph.event.context.ContextGraphNode;
import com.syncleus.dann.graph.Graph;
import com.syncleus.dann.graphicalmodel.GraphicalModelNode;
diff --git a/src/main/java/com/syncleus/dann/graphicalmodel/dynamic/MutableDynamicGraphicalModelAdjacencyGraph.java b/src/main/java/com/syncleus/dann/graphicalmodel/dynamic/MutableDynamicGraphicalModelAdjacencyGraph.java
index ccc49cf3..ba381a59 100644
--- a/src/main/java/com/syncleus/dann/graphicalmodel/dynamic/MutableDynamicGraphicalModelAdjacencyGraph.java
+++ b/src/main/java/com/syncleus/dann/graphicalmodel/dynamic/MutableDynamicGraphicalModelAdjacencyGraph.java
@@ -21,7 +21,7 @@ package com.syncleus.dann.graphicalmodel.dynamic;
import java.util.*;
import com.syncleus.dann.graph.BidirectedEdge;
import com.syncleus.dann.graph.Graph;
-import com.syncleus.dann.graph.context.ContextGraphNode;
+import com.syncleus.dann.graph.event.context.ContextGraphNode;
public class MutableDynamicGraphicalModelAdjacencyGraph<N extends DynamicGraphicalModelNode, E extends BidirectedEdge<N>> extends AbstractDynamicGraphicalModel<N, E> implements MutableDynamicGraphicalModel<N, E>
{
diff --git a/src/main/java/com/syncleus/dann/graphicalmodel/markovrandomfield/MutableMarkovRandomFieldAdjacencyGraph.java b/src/main/java/com/syncleus/dann/graphicalmodel/markovrandomfield/MutableMarkovRandomFieldAdjacencyGraph.java
index 898a5b40..864148ab 100644
--- a/src/main/java/com/syncleus/dann/graphicalmodel/markovrandomfield/MutableMarkovRandomFieldAdjacencyGraph.java
+++ b/src/main/java/com/syncleus/dann/graphicalmodel/markovrandomfield/MutableMarkovRandomFieldAdjacencyGraph.java
@@ -21,7 +21,7 @@ package com.syncleus.dann.graphicalmodel.markovrandomfield;
import java.util.*;
import com.syncleus.dann.graph.UndirectedEdge;
import com.syncleus.dann.graph.Graph;
-import com.syncleus.dann.graph.context.ContextGraphNode;
+import com.syncleus.dann.graph.event.context.ContextGraphNode;
import com.syncleus.dann.graphicalmodel.GraphicalModelNode;
public class MutableMarkovRandomFieldAdjacencyGraph<N extends GraphicalModelNode, E extends UndirectedEdge<N>> extends AbstractMarkovRandomFieldAdjacencyGraph<N, E> implements MutableMarkovRandomField<N, E>
--
GitLab