Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv2199/src/net/sourceforge/bprocessor/model
Modified Files:
Classification.java
Log Message:
removed if's with dublicated code in if and else. removed use of .toString on string objects.
Index: Classification.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Classification.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Classification.java 29 Mar 2007 21:57:49 -0000 1.10
--- Classification.java 11 Apr 2007 12:13:20 -0000 1.11
***************
*** 168,172 ****
public String getFullId(Space cur) {
Space current = cur;
! String fullId = id.toString();
if (current != null && current.getTypeClassification() != null) {
if (!("" + fullId.charAt(0)).equalsIgnoreCase("-")) {
--- 168,172 ----
public String getFullId(Space cur) {
Space current = cur;
! String fullId = id;
if (current != null && current.getTypeClassification() != null) {
if (!("" + fullId.charAt(0)).equalsIgnoreCase("-")) {
***************
*** 184,195 ****
if (cur != null && cur.getOwner().getLevel() != 2) {
current = cur.getOwner();
! if (current.getClassification() == par) {
! if (current.getTypeClassification() != null) {
! fullId = current.getClassification().getFullId(current) + "." + fullId;
! } else {
! fullId = current.getClassification().getFullId(current) + "." + fullId;
! }
par = par.getParent();
- current = current.getOwner();
} else {
fullId = current.getClassification().getFullId(current) + "." + fullId;
--- 184,190 ----
if (cur != null && cur.getOwner().getLevel() != 2) {
current = cur.getOwner();
! if (current.getClassification() == par) {
! fullId = current.getClassification().getFullId(current) + "." + fullId;
par = par.getParent();
} else {
fullId = current.getClassification().getFullId(current) + "." + fullId;
|
