[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Space.java, 1.203, 1.204 Persistence.java, 1.54, 1.55

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv4900/src/net/sourceforge/bprocessor/model

Modified Files:
	Space.java Persistence.java 
Log Message:
Removed level from persistense
Removed building, floor, apartment from space

Index: Persistence.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Persistence.java,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** Persistence.java	6 Nov 2007 19:00:43 -0000	1.54
--- Persistence.java	8 Nov 2007 12:31:35 -0000	1.55
***************
*** 917,921 ****
      xml.setName(space.getName());
      xml.setType(space.getType());
-     xml.setLevel(space.getLevel());
      xml.setTransparent(space.isTransparent());
      xml.setDescription(space.getDescription().toString());
--- 917,920 ----

Index: Space.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v
retrieving revision 1.203
retrieving revision 1.204
diff -C2 -d -r1.203 -r1.204
*** Space.java	6 Nov 2007 19:00:43 -0000	1.203
--- Space.java	8 Nov 2007 12:31:35 -0000	1.204
***************
*** 50,54 ****
    
    /** union flag */
!   private boolean isUnion = false;
    
    /** net flag */
--- 50,54 ----
    
    /** union flag */
!   private boolean isUnion;
    
    /** net flag */
***************
*** 66,70 ****
    
    /** Tell if the space is finished and therefore cannot be edited */
!   private boolean locked = false;
    
    /** If the constructionspace is transparent */
--- 66,70 ----
    
    /** Tell if the space is finished and therefore cannot be edited */
!   private boolean locked;
    
    /** If the constructionspace is transparent */
***************
*** 127,139 ****
    private Modellor modellor;
    
-   /** the building the space belongs to */
-   private String building = "0";
-   /** the floor the space belongs to */
-   private String floor = "0";
-   /** the apartment the space belongs to */
-   private String apartment = "0";
-   /** the room the space belongs to */
-   private String room = "0";
-   
    private LinkedHashMap<String, Object> ownParameters = new LinkedHashMap<String, Object>();
  
--- 127,130 ----
***************
*** 1240,1251 ****
            changedType = true;
          }
-       } else  if (a.getName().equals("Building")) {
-         setBuilding(((String)a.getValue().toString()));
-       } else  if (a.getName().equals("Apartment")) {
-         setApartment(((String)a.getValue().toString()));
-       } else  if (a.getName().equals("Floor")) {
-         setFloor(((String)a.getValue().toString()));
-       } else  if (a.getName().equals("Room")) {
-         setRoom(((String)a.getValue().toString()));
        } else  if (a.getName().equals("Transparent")) {
          setTransparent((((Boolean)a.getValue()).booleanValue()));
--- 1231,1234 ----
***************
*** 1270,1274 ****
      ArrayList<Attribute> res = new ArrayList<Attribute>();
      res.add(new Attribute("Name", getName()));
-     res.add(new Attribute("Level", "" + getLevel()));
      if (getOwner() == Project.getInstance().world()) {
        if (isConstructionSpace()) { 
--- 1253,1256 ----
***************
*** 1306,1315 ****
        }
      }
-     if (isFunctionalSpace()) {
-       res.add(new Attribute("Building", getBuilding(), true));
-       res.add(new Attribute("Floor", getFloor(), true));
-       res.add(new Attribute("Apartment", getApartment(), true));
-       res.add(new Attribute("Room", getRoom(), true));
-     }
      res.add(new Attribute("ID", getId() != null ? getId().toString() : "", false));
      res.add(new Attribute("Owner", getOwner(), false));
--- 1288,1291 ----
***************
*** 2438,2519 ****
      return proto != null;
    }
- 
-   /**
-    * Set the level of the space MOSTLY FOR PERSISTENCE LAYER
-    * @param level the level
-    */
-   protected void setLevel(int level) {
-   }
-   
    
    /**
-    * Get the apartment
-    * @return The apartment
-    * @hibernate.property
-    */
-   public String getApartment() {
-     return apartment;
-   }
- 
-   /**
-    * Set the apartment
-    * @param apartment The apartment
-    */
-   public void setApartment(String apartment) {
-     this.apartment = apartment;
-   }
- 
-   /**
-    * Get the building
-    * @return The building
-    * @hibernate.property
-    */
-   public String getBuilding() {
-     return building;
-   }
- 
-   /**
-    * Set the building
-    * @param building The building
-    */
-   public void setBuilding(String building) {
-     this.building = building;
-   }
- 
-   /**
-    * Get the floor
-    * @return The floor
-    * @hibernate.property
-    */
-   public String getFloor() {
-     return floor;
-   }
- 
-   /**
-    * Set the floor
-    * @param floor The floor
-    */
-   public void setFloor(String floor) {
-     this.floor = floor;
-   }
- 
-   /**
-    * Get the room
-    * @return The room
-    * @hibernate.property
-    */
-   public String getRoom() {
-     return room;
-   }
- 
-   /**
-    * Set the room
-    * @param room The room
-    */
-   public void setRoom(String room) {
-     this.room = room;
-   }
- 
-   /**
     * Return the level of the space as a string
     * @return The string representation of the space level
--- 2414,2419 ----