Update of /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/calculation
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2744/src/net/sf/magicmap/server/calculation
Modified Files:
Tag: ServerCalculationBranch
CalculationManager.java Calculation.java
Log Message:
Update
Index: CalculationManager.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/calculation/Attic/CalculationManager.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** CalculationManager.java 17 Jan 2006 15:50:56 -0000 1.1.2.1
--- CalculationManager.java 18 Jan 2006 14:52:57 -0000 1.1.2.2
***************
*** 7,11 ****
public class CalculationManager {
! private HashMap<String,NodeModel>
}
--- 7,47 ----
public class CalculationManager {
! static CalculationManager singleton_CalculationManager = null;
!
! private HashMap calculators = null;
!
! public static CalculationManager getInstance()
! {
! if (singleton_CalculationManager == null)
! singleton_CalculationManager = new CalculationManager();
! return singleton_CalculationManager;
! }
!
! public void addMap(String mapName)
! {
! calculators.put(mapName,new NodeModel());
! }
!
! public void addMap(String mapName, NodeModel nodeModel)
! {
! calculators.put(mapName, nodeModel);
! }
!
!
!
! public NodeModel getNodeModel(String mapName)
! {
! if (calculators.containsKey(mapName))
! {
! return (NodeModel) calculators.get(mapName);
! }
! return null;
! }
!
!
! private CalculationManager()
! {
! calculators = new HashMap<String,NodeModel>();
! }
}
Index: Calculation.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/calculation/Attic/Calculation.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** Calculation.java 17 Jan 2006 15:50:56 -0000 1.1.2.1
--- Calculation.java 18 Jan 2006 14:52:57 -0000 1.1.2.2
***************
*** 20,24 ****
public class Calculation implements CalculationInterface {
! public void positionCreatedOrUpdatedOrDeleted(String mapName, PositionDTO position) {
try{
SwingUtilities.invokeAndWait(new Runnable() {
--- 20,24 ----
public class Calculation implements CalculationInterface {
! public void positionCreatedOrUpdatedOrDeleted(final String mapName, final PositionDTO position) {
try{
SwingUtilities.invokeAndWait(new Runnable() {
***************
*** 26,30 ****
public void run(){
try{
! NodeModel nodeModel = controller.getNodeModel();
Node node = nodeModel.findNode(position.getName());
--- 26,31 ----
public void run(){
try{
!
! NodeModel nodeModel = CalculationManager.getInstance().getNodeModel(mapName);
Node node = nodeModel.findNode(position.getName());
|
