Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/xml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15909
Modified Files:
PersistenceManager.java
Log Message:
Fix import and save attribute values
Index: PersistenceManager.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/xml/PersistenceManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PersistenceManager.java 4 Aug 2005 10:48:30 -0000 1.4
--- PersistenceManager.java 24 Aug 2005 06:58:37 -0000 1.5
***************
*** 7,10 ****
--- 7,11 ----
package net.sourceforge.bprocessor.model.xml;
+ import net.sourceforge.bprocessor.model.AttributeFacade;
import net.sourceforge.bprocessor.model.ConstructionSpace;
import net.sourceforge.bprocessor.model.ConstructionSpaceFacade;
***************
*** 134,138 ****
net.sourceforge.bprocessor.model.Attribute am =
! new net.sourceforge.bprocessor.model.Attribute(a.getName(), a.getType(), null);
mapper.put(new Long(a.getId()), am.getId());
--- 135,141 ----
net.sourceforge.bprocessor.model.Attribute am =
! new net.sourceforge.bprocessor.model.Attribute(a.getName(), a.getType(), a.getValue());
!
! am = AttributeFacade.getInstance().create(am);
mapper.put(new Long(a.getId()), am.getId());
***************
*** 153,159 ****
ConstructionSpace csm = new ConstructionSpace(cs.getName());
- mapper.put(new Long(cs.getId()), csm.getId());
-
csm = ConstructionSpaceFacade.getInstance().create(csm);
}
}
--- 156,162 ----
ConstructionSpace csm = new ConstructionSpace(cs.getName());
csm = ConstructionSpaceFacade.getInstance().create(csm);
+
+ mapper.put(new Long(cs.getId()), csm.getId());
}
}
***************
*** 170,176 ****
FunctionalSpace fsm = new FunctionalSpace(fs.getName());
- mapper.put(new Long(fs.getId()), fsm.getId());
-
fsm = FunctionalSpaceFacade.getInstance().create(fsm);
}
}
--- 173,179 ----
FunctionalSpace fsm = new FunctionalSpace(fs.getName());
fsm = FunctionalSpaceFacade.getInstance().create(fsm);
+
+ mapper.put(new Long(fs.getId()), fsm.getId());
}
}
***************
*** 189,195 ****
new net.sourceforge.bprocessor.model.Element(e.getName());
- mapper.put(new Long(e.getId()), em.getId());
-
em = ElementFacade.getInstance().create(em);
}
}
--- 192,198 ----
new net.sourceforge.bprocessor.model.Element(e.getName());
em = ElementFacade.getInstance().create(em);
+
+ mapper.put(new Long(e.getId()), em.getId());
}
}
***************
*** 208,214 ****
new net.sourceforge.bprocessor.model.Part(p.getName());
- mapper.put(new Long(p.getId()), pm.getId());
-
pm = PartFacade.getInstance().create(pm);
}
}
--- 211,217 ----
new net.sourceforge.bprocessor.model.Part(p.getName());
pm = PartFacade.getInstance().create(pm);
+
+ mapper.put(new Long(p.getId()), pm.getId());
}
}
***************
*** 229,235 ****
sm.setConstructor(s.isConstructor());
- mapper.put(new Long(s.getId()), sm.getId());
-
sm = SurfaceFacade.getInstance().create(sm);
}
}
--- 232,238 ----
sm.setConstructor(s.isConstructor());
sm = SurfaceFacade.getInstance().create(sm);
+
+ mapper.put(new Long(s.getId()), sm.getId());
}
}
***************
*** 248,254 ****
new net.sourceforge.bprocessor.model.Edge(e.getName());
- mapper.put(new Long(e.getId()), em.getId());
-
em = EdgeFacade.getInstance().create(em);
}
}
--- 251,257 ----
new net.sourceforge.bprocessor.model.Edge(e.getName());
em = EdgeFacade.getInstance().create(em);
+
+ mapper.put(new Long(e.getId()), em.getId());
}
}
***************
*** 272,278 ****
vm.setW(v.getW());
- mapper.put(new Long(v.getId()), vm.getId());
-
vm = VertexFacade.getInstance().create(vm);
}
}
--- 275,281 ----
vm.setW(v.getW());
vm = VertexFacade.getInstance().create(vm);
+
+ mapper.put(new Long(v.getId()), vm.getId());
}
}
***************
*** 634,637 ****
--- 637,641 ----
ax.setName(a.getName());
ax.setType(a.getType());
+ ax.setValue(a.getValue());
bp.getAttribute().add(ax);
|
