From 077398283cb3fbc0900ed5307d74939d3b7c6920 Mon Sep 17 00:00:00 2001 From: Alena Laskavaia Date: Wed, 21 Apr 2010 01:41:53 +0000 Subject: [PATCH] - renamed provisional package --- .../model/cfg/ControlFlowGraphBuilder.java | 14 +++++++------- .../model/cfg/CxxControlFlowGraph.java | 4 ++-- .../cxx/internal/model/cfg/CxxExitNode.java | 2 +- .../cxx/internal/model/cfg/CxxNodeFactory.java | 12 ++++++------ .../codan/core/cfg/ControlFlowGraphTest.java | 18 +++++++++--------- .../META-INF/MANIFEST.MF | 4 ++-- .../core/model/cfg/IBasicBlock.java | 2 +- .../core/model/cfg/IBranchNode.java | 2 +- .../core/model/cfg/IConnectorNode.java | 2 +- .../core/model/cfg/IControlFlowGraph.java | 2 +- .../core/model/cfg/IDecisionNode.java | 2 +- .../core/model/cfg/IExitNode.java | 2 +- .../core/model/cfg/IJumpNode.java | 2 +- .../core/model/cfg/INodeFactory.java | 2 +- .../core/model/cfg/IPlainNode.java | 2 +- .../core/model/cfg/ISingleIncoming.java | 2 +- .../core/model/cfg/ISingleOutgoing.java | 2 +- .../core/model/cfg/IStartNode.java | 2 +- .../core/model/cfg/NodeFactory.java | 10 +++++----- .../internal/core/cfg/AbstractBasicBlock.java | 2 +- .../core/cfg/AbstractSingleIncomingNode.java | 5 +++-- .../core/cfg/AbstractSingleOutgoingNode.java | 7 ++++--- .../codan/internal/core/cfg/BranchNode.java | 4 ++-- .../codan/internal/core/cfg/ConnectorNode.java | 9 +++++---- .../internal/core/cfg/ControlFlowGraph.java | 18 +++++++++--------- .../codan/internal/core/cfg/DecisionNode.java | 10 +++++----- .../cdt/codan/internal/core/cfg/ExitNode.java | 7 ++++--- .../cdt/codan/internal/core/cfg/JumpNode.java | 8 ++++---- .../cdt/codan/internal/core/cfg/PlainNode.java | 6 +++--- .../cdt/codan/internal/core/cfg/StartNode.java | 5 +++-- .../ui/cfgview/views/ControlFlowGraphView.java | 18 +++++++++--------- 31 files changed, 96 insertions(+), 91 deletions(-) rename codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/{provisional => }/core/model/cfg/IBasicBlock.java (89%) rename codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/{provisional => }/core/model/cfg/IBranchNode.java (93%) rename codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/{provisional => }/core/model/cfg/IConnectorNode.java (75%) rename codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/{provisional => }/core/model/cfg/IControlFlowGraph.java (93%) rename codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/{provisional => }/core/model/cfg/IDecisionNode.java (86%) rename codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/{provisional => }/core/model/cfg/IExitNode.java (92%) rename codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/{provisional => }/core/model/cfg/IJumpNode.java (68%) rename codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/{provisional => }/core/model/cfg/INodeFactory.java (93%) rename codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/{provisional => }/core/model/cfg/IPlainNode.java (60%) rename codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/{provisional => }/core/model/cfg/ISingleIncoming.java (53%) rename codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/{provisional => }/core/model/cfg/ISingleOutgoing.java (53%) rename codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/{provisional => }/core/model/cfg/IStartNode.java (81%) rename codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/{provisional => }/core/model/cfg/NodeFactory.java (85%) diff --git a/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/internal/model/cfg/ControlFlowGraphBuilder.java b/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/internal/model/cfg/ControlFlowGraphBuilder.java index fa7ec8be3c7..dbb82accc43 100644 --- a/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/internal/model/cfg/ControlFlowGraphBuilder.java +++ b/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/internal/model/cfg/ControlFlowGraphBuilder.java @@ -14,17 +14,17 @@ import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; +import org.eclipse.cdt.codan.core.model.cfg.IBasicBlock; +import org.eclipse.cdt.codan.core.model.cfg.IBranchNode; +import org.eclipse.cdt.codan.core.model.cfg.IConnectorNode; +import org.eclipse.cdt.codan.core.model.cfg.IExitNode; +import org.eclipse.cdt.codan.core.model.cfg.IJumpNode; +import org.eclipse.cdt.codan.core.model.cfg.IPlainNode; +import org.eclipse.cdt.codan.core.model.cfg.IStartNode; import org.eclipse.cdt.codan.internal.core.cfg.AbstractBasicBlock; import org.eclipse.cdt.codan.internal.core.cfg.ConnectorNode; import org.eclipse.cdt.codan.internal.core.cfg.DecisionNode; import org.eclipse.cdt.codan.internal.core.cfg.JumpNode; -import org.eclipse.cdt.codan.provisional.core.model.cfg.IBasicBlock; -import org.eclipse.cdt.codan.provisional.core.model.cfg.IConnectorNode; -import org.eclipse.cdt.codan.provisional.core.model.cfg.IExitNode; -import org.eclipse.cdt.codan.provisional.core.model.cfg.IJumpNode; -import org.eclipse.cdt.codan.provisional.core.model.cfg.IBranchNode; -import org.eclipse.cdt.codan.provisional.core.model.cfg.IPlainNode; -import org.eclipse.cdt.codan.provisional.core.model.cfg.IStartNode; import org.eclipse.cdt.core.dom.ast.IASTBreakStatement; import org.eclipse.cdt.core.dom.ast.IASTCaseStatement; import org.eclipse.cdt.core.dom.ast.IASTCompoundStatement; diff --git a/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/internal/model/cfg/CxxControlFlowGraph.java b/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/internal/model/cfg/CxxControlFlowGraph.java index f9386e20704..ec6e30077a7 100644 --- a/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/internal/model/cfg/CxxControlFlowGraph.java +++ b/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/internal/model/cfg/CxxControlFlowGraph.java @@ -12,9 +12,9 @@ package org.eclipse.cdt.codan.core.cxx.internal.model.cfg; import java.util.Collection; +import org.eclipse.cdt.codan.core.model.cfg.IExitNode; +import org.eclipse.cdt.codan.core.model.cfg.IStartNode; import org.eclipse.cdt.codan.internal.core.cfg.ControlFlowGraph; -import org.eclipse.cdt.codan.provisional.core.model.cfg.IExitNode; -import org.eclipse.cdt.codan.provisional.core.model.cfg.IStartNode; import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition; /** diff --git a/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/internal/model/cfg/CxxExitNode.java b/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/internal/model/cfg/CxxExitNode.java index 44005e773bf..b12134947d4 100644 --- a/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/internal/model/cfg/CxxExitNode.java +++ b/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/internal/model/cfg/CxxExitNode.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.cdt.codan.core.cxx.internal.model.cfg; +import org.eclipse.cdt.codan.core.model.cfg.IExitNode; import org.eclipse.cdt.codan.internal.core.cfg.ExitNode; -import org.eclipse.cdt.codan.provisional.core.model.cfg.IExitNode; import org.eclipse.cdt.core.dom.ast.IASTNode; /** diff --git a/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/internal/model/cfg/CxxNodeFactory.java b/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/internal/model/cfg/CxxNodeFactory.java index 61e1ccb7fb1..40962f4bf8f 100644 --- a/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/internal/model/cfg/CxxNodeFactory.java +++ b/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/internal/model/cfg/CxxNodeFactory.java @@ -10,13 +10,13 @@ *******************************************************************************/ package org.eclipse.cdt.codan.core.cxx.internal.model.cfg; +import org.eclipse.cdt.codan.core.model.cfg.IBranchNode; +import org.eclipse.cdt.codan.core.model.cfg.IDecisionNode; +import org.eclipse.cdt.codan.core.model.cfg.IExitNode; +import org.eclipse.cdt.codan.core.model.cfg.INodeFactory; +import org.eclipse.cdt.codan.core.model.cfg.IPlainNode; +import org.eclipse.cdt.codan.core.model.cfg.NodeFactory; import org.eclipse.cdt.codan.internal.core.cfg.AbstractBasicBlock; -import org.eclipse.cdt.codan.provisional.core.model.cfg.IDecisionNode; -import org.eclipse.cdt.codan.provisional.core.model.cfg.IExitNode; -import org.eclipse.cdt.codan.provisional.core.model.cfg.IBranchNode; -import org.eclipse.cdt.codan.provisional.core.model.cfg.INodeFactory; -import org.eclipse.cdt.codan.provisional.core.model.cfg.IPlainNode; -import org.eclipse.cdt.codan.provisional.core.model.cfg.NodeFactory; import org.eclipse.cdt.core.dom.ast.IASTNode; /** diff --git a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/cfg/ControlFlowGraphTest.java b/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/cfg/ControlFlowGraphTest.java index 21544c87d09..aa9fcf244a7 100644 --- a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/cfg/ControlFlowGraphTest.java +++ b/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/cfg/ControlFlowGraphTest.java @@ -14,18 +14,18 @@ import java.util.Collection; import java.util.Iterator; import org.eclipse.cdt.codan.core.cxx.internal.model.cfg.ControlFlowGraphBuilder; +import org.eclipse.cdt.codan.core.model.cfg.IBasicBlock; +import org.eclipse.cdt.codan.core.model.cfg.IBranchNode; +import org.eclipse.cdt.codan.core.model.cfg.IConnectorNode; +import org.eclipse.cdt.codan.core.model.cfg.IDecisionNode; +import org.eclipse.cdt.codan.core.model.cfg.IExitNode; +import org.eclipse.cdt.codan.core.model.cfg.IJumpNode; +import org.eclipse.cdt.codan.core.model.cfg.IPlainNode; +import org.eclipse.cdt.codan.core.model.cfg.ISingleOutgoing; +import org.eclipse.cdt.codan.core.model.cfg.IStartNode; import org.eclipse.cdt.codan.core.test.CodanTestCase; import org.eclipse.cdt.codan.internal.core.cfg.AbstractBasicBlock; import org.eclipse.cdt.codan.internal.core.cfg.ControlFlowGraph; -import org.eclipse.cdt.codan.provisional.core.model.cfg.IBasicBlock; -import org.eclipse.cdt.codan.provisional.core.model.cfg.IBranchNode; -import org.eclipse.cdt.codan.provisional.core.model.cfg.IConnectorNode; -import org.eclipse.cdt.codan.provisional.core.model.cfg.IDecisionNode; -import org.eclipse.cdt.codan.provisional.core.model.cfg.IExitNode; -import org.eclipse.cdt.codan.provisional.core.model.cfg.IJumpNode; -import org.eclipse.cdt.codan.provisional.core.model.cfg.IPlainNode; -import org.eclipse.cdt.codan.provisional.core.model.cfg.ISingleOutgoing; -import org.eclipse.cdt.codan.provisional.core.model.cfg.IStartNode; import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.dom.ast.IASTDeclaration; import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition; diff --git a/codan/org.eclipse.cdt.codan.core/META-INF/MANIFEST.MF b/codan/org.eclipse.cdt.codan.core/META-INF/MANIFEST.MF index bd5608920dc..a0f9f2dc643 100644 --- a/codan/org.eclipse.cdt.codan.core/META-INF/MANIFEST.MF +++ b/codan/org.eclipse.cdt.codan.core/META-INF/MANIFEST.MF @@ -11,11 +11,11 @@ Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Package: org.eclipse.cdt.codan.core, org.eclipse.cdt.codan.core.model, + org.eclipse.cdt.codan.core.model.cfg, org.eclipse.cdt.codan.internal.core; x-friends:="org.eclipse.cdt.codan.core, org.eclipse.cdt.codan.core.cxx, org.eclipse.cdt.codan.core.test, org.eclipse.cdt.codan.ui", org.eclipse.cdt.codan.internal.core.cfg;x-friends:="org.eclipse.cdt.codan.core.cxx", - org.eclipse.cdt.codan.internal.core.model;x-friends:="org.eclipse.cdt.codan.core.cxx,org.eclipse.cdt.codan.core.test,org.eclipse.cdt.codan.ui", - org.eclipse.cdt.codan.provisional.core.model.cfg + org.eclipse.cdt.codan.internal.core.model;x-friends:="org.eclipse.cdt.codan.core.cxx,org.eclipse.cdt.codan.core.test,org.eclipse.cdt.codan.ui" diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/provisional/core/model/cfg/IBasicBlock.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/cfg/IBasicBlock.java similarity index 89% rename from codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/provisional/core/model/cfg/IBasicBlock.java rename to codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/cfg/IBasicBlock.java index 6f9dbfbecdc..eaa21f3be2f 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/provisional/core/model/cfg/IBasicBlock.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/cfg/IBasicBlock.java @@ -1,4 +1,4 @@ -package org.eclipse.cdt.codan.provisional.core.model.cfg; +package org.eclipse.cdt.codan.core.model.cfg; import java.util.Iterator; diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/provisional/core/model/cfg/IBranchNode.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/cfg/IBranchNode.java similarity index 93% rename from codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/provisional/core/model/cfg/IBranchNode.java rename to codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/cfg/IBranchNode.java index 13c1dff66d6..16cc25892bd 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/provisional/core/model/cfg/IBranchNode.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/cfg/IBranchNode.java @@ -8,7 +8,7 @@ * Contributors: * Alena Laskavaia - initial API and implementation *******************************************************************************/ -package org.eclipse.cdt.codan.provisional.core.model.cfg; +package org.eclipse.cdt.codan.core.model.cfg; /** * Node that represent empty operator with label, such as case branch or label diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/provisional/core/model/cfg/IConnectorNode.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/cfg/IConnectorNode.java similarity index 75% rename from codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/provisional/core/model/cfg/IConnectorNode.java rename to codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/cfg/IConnectorNode.java index 72f032d8a07..6b8ded9337f 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/provisional/core/model/cfg/IConnectorNode.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/cfg/IConnectorNode.java @@ -1,4 +1,4 @@ -package org.eclipse.cdt.codan.provisional.core.model.cfg; +package org.eclipse.cdt.codan.core.model.cfg; public interface IConnectorNode extends IBasicBlock, ISingleOutgoing { /** Backward connector has incoming node which comes from backward arcs */ diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/provisional/core/model/cfg/IControlFlowGraph.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/cfg/IControlFlowGraph.java similarity index 93% rename from codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/provisional/core/model/cfg/IControlFlowGraph.java rename to codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/cfg/IControlFlowGraph.java index 1e81d9050f3..13a5aa02b26 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/provisional/core/model/cfg/IControlFlowGraph.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/cfg/IControlFlowGraph.java @@ -8,7 +8,7 @@ * Contributors: * Alena Laskavaia - initial API and implementation *******************************************************************************/ -package org.eclipse.cdt.codan.provisional.core.model.cfg; +package org.eclipse.cdt.codan.core.model.cfg; import java.util.Collection; import java.util.Iterator; diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/provisional/core/model/cfg/IDecisionNode.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/cfg/IDecisionNode.java similarity index 86% rename from codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/provisional/core/model/cfg/IDecisionNode.java rename to codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/cfg/IDecisionNode.java index eabcf482650..bb81e673efc 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/provisional/core/model/cfg/IDecisionNode.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/cfg/IDecisionNode.java @@ -1,4 +1,4 @@ -package org.eclipse.cdt.codan.provisional.core.model.cfg; +package org.eclipse.cdt.codan.core.model.cfg; /** * diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/provisional/core/model/cfg/IExitNode.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/cfg/IExitNode.java similarity index 92% rename from codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/provisional/core/model/cfg/IExitNode.java rename to codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/cfg/IExitNode.java index 5e0b7d9bce0..1c626cc7f24 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/provisional/core/model/cfg/IExitNode.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/cfg/IExitNode.java @@ -8,7 +8,7 @@ * Contributors: * Alena Laskavaia - initial API and implementation *******************************************************************************/ -package org.eclipse.cdt.codan.provisional.core.model.cfg; +package org.eclipse.cdt.codan.core.model.cfg; /** * Exit node of the graph. Usually return from the function, can also be throw diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/provisional/core/model/cfg/IJumpNode.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/cfg/IJumpNode.java similarity index 68% rename from codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/provisional/core/model/cfg/IJumpNode.java rename to codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/cfg/IJumpNode.java index 8bde8bb073f..280675f7fa5 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/provisional/core/model/cfg/IJumpNode.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/cfg/IJumpNode.java @@ -1,4 +1,4 @@ -package org.eclipse.cdt.codan.provisional.core.model.cfg; +package org.eclipse.cdt.codan.core.model.cfg; public interface IJumpNode extends IBasicBlock, ISingleOutgoing { boolean isBackwardArc(); diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/provisional/core/model/cfg/INodeFactory.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/cfg/INodeFactory.java similarity index 93% rename from codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/provisional/core/model/cfg/INodeFactory.java rename to codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/cfg/INodeFactory.java index 10e041fe115..dff1918b53c 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/provisional/core/model/cfg/INodeFactory.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/cfg/INodeFactory.java @@ -8,7 +8,7 @@ * Contributors: * Alena Laskavaia - initial API and implementation *******************************************************************************/ -package org.eclipse.cdt.codan.provisional.core.model.cfg; +package org.eclipse.cdt.codan.core.model.cfg; /** * Control Flow Graph Node factory diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/provisional/core/model/cfg/IPlainNode.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/cfg/IPlainNode.java similarity index 60% rename from codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/provisional/core/model/cfg/IPlainNode.java rename to codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/cfg/IPlainNode.java index c845e9c6795..b23aec785c9 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/provisional/core/model/cfg/IPlainNode.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/cfg/IPlainNode.java @@ -1,4 +1,4 @@ -package org.eclipse.cdt.codan.provisional.core.model.cfg; +package org.eclipse.cdt.codan.core.model.cfg; public interface IPlainNode extends IBasicBlock, ISingleOutgoing, ISingleIncoming { diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/provisional/core/model/cfg/ISingleIncoming.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/cfg/ISingleIncoming.java similarity index 53% rename from codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/provisional/core/model/cfg/ISingleIncoming.java rename to codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/cfg/ISingleIncoming.java index 60e2e4d501d..2469ef09d96 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/provisional/core/model/cfg/ISingleIncoming.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/cfg/ISingleIncoming.java @@ -1,4 +1,4 @@ -package org.eclipse.cdt.codan.provisional.core.model.cfg; +package org.eclipse.cdt.codan.core.model.cfg; public interface ISingleIncoming { IBasicBlock getIncoming(); diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/provisional/core/model/cfg/ISingleOutgoing.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/cfg/ISingleOutgoing.java similarity index 53% rename from codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/provisional/core/model/cfg/ISingleOutgoing.java rename to codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/cfg/ISingleOutgoing.java index 50d4227edb2..4a628482279 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/provisional/core/model/cfg/ISingleOutgoing.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/cfg/ISingleOutgoing.java @@ -1,4 +1,4 @@ -package org.eclipse.cdt.codan.provisional.core.model.cfg; +package org.eclipse.cdt.codan.core.model.cfg; public interface ISingleOutgoing { IBasicBlock getOutgoing(); diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/provisional/core/model/cfg/IStartNode.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/cfg/IStartNode.java similarity index 81% rename from codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/provisional/core/model/cfg/IStartNode.java rename to codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/cfg/IStartNode.java index dc75d2540d4..9e5194aad8b 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/provisional/core/model/cfg/IStartNode.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/cfg/IStartNode.java @@ -1,4 +1,4 @@ -package org.eclipse.cdt.codan.provisional.core.model.cfg; +package org.eclipse.cdt.codan.core.model.cfg; /** diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/provisional/core/model/cfg/NodeFactory.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/cfg/NodeFactory.java similarity index 85% rename from codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/provisional/core/model/cfg/NodeFactory.java rename to codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/cfg/NodeFactory.java index 0129e4928fd..920e5ee2e47 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/provisional/core/model/cfg/NodeFactory.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/cfg/NodeFactory.java @@ -8,7 +8,7 @@ * Contributors: * Alena Laskavaia - initial API and implementation *******************************************************************************/ -package org.eclipse.cdt.codan.provisional.core.model.cfg; +package org.eclipse.cdt.codan.core.model.cfg; import org.eclipse.cdt.codan.internal.core.cfg.ConnectorNode; import org.eclipse.cdt.codan.internal.core.cfg.DecisionNode; @@ -41,7 +41,7 @@ public class NodeFactory implements INodeFactory { * (non-Javadoc) * * @see - * org.eclipse.cdt.codan.provisional.core.model.cfg.INodeFactory#createPlainNode + * org.eclipse.cdt.codan.core.model.cfg.INodeFactory#createPlainNode * () */ public IPlainNode createPlainNode() { @@ -52,7 +52,7 @@ public class NodeFactory implements INodeFactory { * (non-Javadoc) * * @see - * org.eclipse.cdt.codan.provisional.core.model.cfg.INodeFactory#createJumpNode + * org.eclipse.cdt.codan.core.model.cfg.INodeFactory#createJumpNode * () */ public IJumpNode createJumpNode() { @@ -83,7 +83,7 @@ public class NodeFactory implements INodeFactory { * (non-Javadoc) * * @see - * org.eclipse.cdt.codan.provisional.core.model.cfg.INodeFactory#createStartNode + * org.eclipse.cdt.codan.core.model.cfg.INodeFactory#createStartNode * () */ public IStartNode createStartNode() { @@ -94,7 +94,7 @@ public class NodeFactory implements INodeFactory { * (non-Javadoc) * * @see - * org.eclipse.cdt.codan.provisional.core.model.cfg.INodeFactory#createExitNode + * org.eclipse.cdt.codan.core.model.cfg.INodeFactory#createExitNode * () */ public IExitNode createExitNode() { diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/AbstractBasicBlock.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/AbstractBasicBlock.java index dbd9134d914..512c7e2e256 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/AbstractBasicBlock.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/AbstractBasicBlock.java @@ -2,7 +2,7 @@ package org.eclipse.cdt.codan.internal.core.cfg; import java.util.Iterator; -import org.eclipse.cdt.codan.provisional.core.model.cfg.IBasicBlock; +import org.eclipse.cdt.codan.core.model.cfg.IBasicBlock; public abstract class AbstractBasicBlock implements IBasicBlock { private Object data; diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/AbstractSingleIncomingNode.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/AbstractSingleIncomingNode.java index b8948fdfead..8f0d93b47b1 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/AbstractSingleIncomingNode.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/AbstractSingleIncomingNode.java @@ -1,8 +1,9 @@ package org.eclipse.cdt.codan.internal.core.cfg; import java.util.Iterator; -import org.eclipse.cdt.codan.provisional.core.model.cfg.IBasicBlock; -import org.eclipse.cdt.codan.provisional.core.model.cfg.ISingleIncoming; + +import org.eclipse.cdt.codan.core.model.cfg.IBasicBlock; +import org.eclipse.cdt.codan.core.model.cfg.ISingleIncoming; /** * Abstrat node with one incoming arc diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/AbstractSingleOutgoingNode.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/AbstractSingleOutgoingNode.java index a243be850ed..915693a5679 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/AbstractSingleOutgoingNode.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/AbstractSingleOutgoingNode.java @@ -1,8 +1,9 @@ package org.eclipse.cdt.codan.internal.core.cfg; import java.util.Iterator; -import org.eclipse.cdt.codan.provisional.core.model.cfg.IBasicBlock; -import org.eclipse.cdt.codan.provisional.core.model.cfg.ISingleOutgoing; + +import org.eclipse.cdt.codan.core.model.cfg.IBasicBlock; +import org.eclipse.cdt.codan.core.model.cfg.ISingleOutgoing; /** * Abstract impl of basic block with single outgoing arc @@ -40,7 +41,7 @@ public abstract class AbstractSingleOutgoingNode extends AbstractBasicBlock * * @see * org.eclipse.cdt.codan.internal.core.cfg.AbstractBasicBlock#addOutgoing - * (org.eclipse.cdt.codan.provisional.core.model.cfg.IBasicBlock) + * (org.eclipse.cdt.codan.core.model.cfg.IBasicBlock) */ @Override public void addOutgoing(IBasicBlock node) { diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/BranchNode.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/BranchNode.java index 976530c846a..a14f2240273 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/BranchNode.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/BranchNode.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.cdt.codan.internal.core.cfg; -import org.eclipse.cdt.codan.provisional.core.model.cfg.IBranchNode; +import org.eclipse.cdt.codan.core.model.cfg.IBranchNode; /** * TODO: add description @@ -27,7 +27,7 @@ public class BranchNode extends PlainNode implements IBranchNode { * (non-Javadoc) * * @see - * org.eclipse.cdt.codan.provisional.core.model.cfg.IBranchNode#getLabel() + * org.eclipse.cdt.codan.core.model.cfg.IBranchNode#getLabel() */ public String getLabel() { return label; diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/ConnectorNode.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/ConnectorNode.java index 5c6301e7010..779709933c0 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/ConnectorNode.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/ConnectorNode.java @@ -12,9 +12,10 @@ package org.eclipse.cdt.codan.internal.core.cfg; import java.util.ArrayList; import java.util.Iterator; -import org.eclipse.cdt.codan.provisional.core.model.cfg.IBasicBlock; -import org.eclipse.cdt.codan.provisional.core.model.cfg.IConnectorNode; -import org.eclipse.cdt.codan.provisional.core.model.cfg.IJumpNode; + +import org.eclipse.cdt.codan.core.model.cfg.IBasicBlock; +import org.eclipse.cdt.codan.core.model.cfg.IConnectorNode; +import org.eclipse.cdt.codan.core.model.cfg.IJumpNode; /** * TODO: add description @@ -46,7 +47,7 @@ public class ConnectorNode extends AbstractSingleOutgoingNode implements * (non-Javadoc) * * @see - * org.eclipse.cdt.codan.provisional.core.model.cfg.IBasicBlock#getIncomingSize + * org.eclipse.cdt.codan.core.model.cfg.IBasicBlock#getIncomingSize * () */ public int getIncomingSize() { diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/ControlFlowGraph.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/ControlFlowGraph.java index 3f08c05990a..d35cb6d784c 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/ControlFlowGraph.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/ControlFlowGraph.java @@ -17,14 +17,14 @@ import java.util.Iterator; import java.util.LinkedHashSet; import java.util.List; -import org.eclipse.cdt.codan.provisional.core.model.cfg.IBasicBlock; -import org.eclipse.cdt.codan.provisional.core.model.cfg.IBranchNode; -import org.eclipse.cdt.codan.provisional.core.model.cfg.IConnectorNode; -import org.eclipse.cdt.codan.provisional.core.model.cfg.IControlFlowGraph; -import org.eclipse.cdt.codan.provisional.core.model.cfg.IDecisionNode; -import org.eclipse.cdt.codan.provisional.core.model.cfg.IExitNode; -import org.eclipse.cdt.codan.provisional.core.model.cfg.ISingleOutgoing; -import org.eclipse.cdt.codan.provisional.core.model.cfg.IStartNode; +import org.eclipse.cdt.codan.core.model.cfg.IBasicBlock; +import org.eclipse.cdt.codan.core.model.cfg.IBranchNode; +import org.eclipse.cdt.codan.core.model.cfg.IConnectorNode; +import org.eclipse.cdt.codan.core.model.cfg.IControlFlowGraph; +import org.eclipse.cdt.codan.core.model.cfg.IDecisionNode; +import org.eclipse.cdt.codan.core.model.cfg.IExitNode; +import org.eclipse.cdt.codan.core.model.cfg.ISingleOutgoing; +import org.eclipse.cdt.codan.core.model.cfg.IStartNode; /** * TODO: add description @@ -119,7 +119,7 @@ public class ControlFlowGraph implements IControlFlowGraph { * (non-Javadoc) * * @see - * org.eclipse.cdt.codan.provisional.core.model.cfg.IControlFlowGraph#getNodes + * org.eclipse.cdt.codan.core.model.cfg.IControlFlowGraph#getNodes * () */ public Collection getNodes() { diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/DecisionNode.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/DecisionNode.java index 0e37cdfc4dd..bfc6b98b230 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/DecisionNode.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/DecisionNode.java @@ -14,10 +14,10 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.eclipse.cdt.codan.provisional.core.model.cfg.IBasicBlock; -import org.eclipse.cdt.codan.provisional.core.model.cfg.IBranchNode; -import org.eclipse.cdt.codan.provisional.core.model.cfg.IConnectorNode; -import org.eclipse.cdt.codan.provisional.core.model.cfg.IDecisionNode; +import org.eclipse.cdt.codan.core.model.cfg.IBasicBlock; +import org.eclipse.cdt.codan.core.model.cfg.IBranchNode; +import org.eclipse.cdt.codan.core.model.cfg.IConnectorNode; +import org.eclipse.cdt.codan.core.model.cfg.IDecisionNode; /** * @see {@link IDecisionNode} @@ -54,7 +54,7 @@ public class DecisionNode extends AbstractSingleIncomingNode implements * (non-Javadoc) * * @see - * org.eclipse.cdt.codan.provisional.core.model.cfg.IBasicBlock#getOutgoingSize + * org.eclipse.cdt.codan.core.model.cfg.IBasicBlock#getOutgoingSize * () */ public int getOutgoingSize() { diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/ExitNode.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/ExitNode.java index db4aef7714b..bc662b2ffbb 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/ExitNode.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/ExitNode.java @@ -2,9 +2,10 @@ package org.eclipse.cdt.codan.internal.core.cfg; import java.util.Collections; import java.util.Iterator; -import org.eclipse.cdt.codan.provisional.core.model.cfg.IBasicBlock; -import org.eclipse.cdt.codan.provisional.core.model.cfg.IExitNode; -import org.eclipse.cdt.codan.provisional.core.model.cfg.IStartNode; + +import org.eclipse.cdt.codan.core.model.cfg.IBasicBlock; +import org.eclipse.cdt.codan.core.model.cfg.IExitNode; +import org.eclipse.cdt.codan.core.model.cfg.IStartNode; /** * Plain node has one prev one jump diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/JumpNode.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/JumpNode.java index a322a0b0dec..b3463812d2c 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/JumpNode.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/JumpNode.java @@ -2,9 +2,9 @@ package org.eclipse.cdt.codan.internal.core.cfg; import java.util.Iterator; -import org.eclipse.cdt.codan.provisional.core.model.cfg.IBasicBlock; -import org.eclipse.cdt.codan.provisional.core.model.cfg.IConnectorNode; -import org.eclipse.cdt.codan.provisional.core.model.cfg.IJumpNode; +import org.eclipse.cdt.codan.core.model.cfg.IBasicBlock; +import org.eclipse.cdt.codan.core.model.cfg.IConnectorNode; +import org.eclipse.cdt.codan.core.model.cfg.IJumpNode; /** * Jump node is node that connects unusual control pass, such as goto, break and @@ -31,7 +31,7 @@ public class JumpNode extends AbstractSingleIncomingNode implements IJumpNode { * (non-Javadoc) * * @see - * org.eclipse.cdt.codan.provisional.core.model.cfg.IJumpNode#getJumpNode() + * org.eclipse.cdt.codan.core.model.cfg.IJumpNode#getJumpNode() */ public IConnectorNode getJumpNode() { return jump; diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/PlainNode.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/PlainNode.java index 6b44eadc09b..6ae9e394e20 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/PlainNode.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/PlainNode.java @@ -2,8 +2,8 @@ package org.eclipse.cdt.codan.internal.core.cfg; import java.util.Iterator; -import org.eclipse.cdt.codan.provisional.core.model.cfg.IBasicBlock; -import org.eclipse.cdt.codan.provisional.core.model.cfg.IPlainNode; +import org.eclipse.cdt.codan.core.model.cfg.IBasicBlock; +import org.eclipse.cdt.codan.core.model.cfg.IPlainNode; /** * Plain node has one incoming arc and one outgoing arc @@ -37,7 +37,7 @@ public class PlainNode extends AbstractSingleIncomingNode implements IPlainNode * * @see * org.eclipse.cdt.codan.internal.core.cfg.AbstractBasicBlock#addOutgoing - * (org.eclipse.cdt.codan.provisional.core.model.cfg.IBasicBlock) + * (org.eclipse.cdt.codan.core.model.cfg.IBasicBlock) */ @Override public void addOutgoing(IBasicBlock node) { diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/StartNode.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/StartNode.java index 19dd968f125..fbc6613efc5 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/StartNode.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/StartNode.java @@ -2,8 +2,9 @@ package org.eclipse.cdt.codan.internal.core.cfg; import java.util.Collections; import java.util.Iterator; -import org.eclipse.cdt.codan.provisional.core.model.cfg.IBasicBlock; -import org.eclipse.cdt.codan.provisional.core.model.cfg.IStartNode; + +import org.eclipse.cdt.codan.core.model.cfg.IBasicBlock; +import org.eclipse.cdt.codan.core.model.cfg.IStartNode; /** * Start node has no incoming, one outgoing and it is connect to function exits diff --git a/codan/org.eclipse.cdt.codan.ui.cfgview/src/org/eclipse/cdt/codan/ui/cfgview/views/ControlFlowGraphView.java b/codan/org.eclipse.cdt.codan.ui.cfgview/src/org/eclipse/cdt/codan/ui/cfgview/views/ControlFlowGraphView.java index 59a1a4644d6..5f6078fd7e9 100644 --- a/codan/org.eclipse.cdt.codan.ui.cfgview/src/org/eclipse/cdt/codan/ui/cfgview/views/ControlFlowGraphView.java +++ b/codan/org.eclipse.cdt.codan.ui.cfgview/src/org/eclipse/cdt/codan/ui/cfgview/views/ControlFlowGraphView.java @@ -6,16 +6,16 @@ import java.util.Iterator; import org.eclipse.cdt.codan.core.cxx.internal.model.cfg.ControlFlowGraphBuilder; import org.eclipse.cdt.codan.core.cxx.internal.model.cfg.CxxControlFlowGraph; +import org.eclipse.cdt.codan.core.model.cfg.IBasicBlock; +import org.eclipse.cdt.codan.core.model.cfg.IBranchNode; +import org.eclipse.cdt.codan.core.model.cfg.IConnectorNode; +import org.eclipse.cdt.codan.core.model.cfg.IControlFlowGraph; +import org.eclipse.cdt.codan.core.model.cfg.IDecisionNode; +import org.eclipse.cdt.codan.core.model.cfg.IExitNode; +import org.eclipse.cdt.codan.core.model.cfg.IJumpNode; +import org.eclipse.cdt.codan.core.model.cfg.ISingleOutgoing; +import org.eclipse.cdt.codan.core.model.cfg.IStartNode; import org.eclipse.cdt.codan.internal.core.cfg.AbstractBasicBlock; -import org.eclipse.cdt.codan.provisional.core.model.cfg.IBasicBlock; -import org.eclipse.cdt.codan.provisional.core.model.cfg.IConnectorNode; -import org.eclipse.cdt.codan.provisional.core.model.cfg.IControlFlowGraph; -import org.eclipse.cdt.codan.provisional.core.model.cfg.IDecisionNode; -import org.eclipse.cdt.codan.provisional.core.model.cfg.IExitNode; -import org.eclipse.cdt.codan.provisional.core.model.cfg.IJumpNode; -import org.eclipse.cdt.codan.provisional.core.model.cfg.IBranchNode; -import org.eclipse.cdt.codan.provisional.core.model.cfg.ISingleOutgoing; -import org.eclipse.cdt.codan.provisional.core.model.cfg.IStartNode; import org.eclipse.cdt.codan.ui.cfgview.ControlFlowGraphPlugin; import org.eclipse.cdt.core.dom.ast.IASTDeclaration; import org.eclipse.cdt.core.dom.ast.IASTFileLocation;