Update of /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29167/src/net/sourceforge/bprocessor/facade/modellor
Modified Files:
NetFacadeModellor.java
Log Message:
avoids creating parameterblock in entity when not needed
Index: NetFacadeModellor.java
===================================================================
RCS file: /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor/NetFacadeModellor.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** NetFacadeModellor.java 9 Aug 2007 16:04:33 -0000 1.35
--- NetFacadeModellor.java 18 Oct 2007 08:46:30 -0000 1.36
***************
*** 349,359 ****
Collection<Edge> edges = n.getEdges();
for (Edge e : edges) {
! Map env = e.getParameters().environment();
if (env.get("width") == null) {
! e.getParameters().put("width", frameWidth);
}
}
for (Surface s : n.getSurfaces()) {
! Map env = s.getParameters().environment();
if (env.get("type") == null) {
List options = new LinkedList();
--- 349,369 ----
Collection<Edge> edges = n.getEdges();
for (Edge e : edges) {
! ParameterBlock parameters = e.getParameters();
! if (parameters == null) {
! parameters = new ParameterBlock();
! e.setParameters(parameters);
! }
! Map env = parameters.environment();
if (env.get("width") == null) {
! parameters.put("width", frameWidth);
}
}
for (Surface s : n.getSurfaces()) {
! ParameterBlock parameters = s.getParameters();
! if (parameters == null) {
! parameters = new ParameterBlock();
! s.setParameters(parameters);
! }
! Map env = parameters.environment();
if (env.get("type") == null) {
List options = new LinkedList();
***************
*** 363,367 ****
Selector sel = new Selector(options);
sel.setCurrentValue("Glass");
! s.getParameters().put(new Attribute("type", sel));
}
if (!single && (env.get("cut") == null)) {
--- 373,377 ----
Selector sel = new Selector(options);
sel.setCurrentValue("Glass");
! parameters.put(new Attribute("type", sel));
}
if (!single && (env.get("cut") == null)) {
***************
*** 371,375 ****
Selector sel = new Selector(options);
sel.setCurrentValue("type1");
! s.getParameters().put(new Attribute("cut", sel));
}
}
--- 381,385 ----
Selector sel = new Selector(options);
sel.setCurrentValue("type1");
! parameters.put(new Attribute("cut", sel));
}
}
|