[Bprocessor-commit] gui/src/net/sourceforge/bprocessor/gui/actions ImportFileReader.java, 1.21, 1.22 FileImportActionListener.java, 1.25, 1.26

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

Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25644/src/net/sourceforge/bprocessor/gui/actions

Modified Files:
	ImportFileReader.java FileImportActionListener.java 
Log Message:
item to space


Index: FileImportActionListener.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/FileImportActionListener.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** FileImportActionListener.java	25 Jun 2009 22:17:33 -0000	1.25
--- FileImportActionListener.java	25 Jun 2009 23:28:46 -0000	1.26
***************
*** 28,33 ****
  import net.sourceforge.bprocessor.model.Project;
  import net.sourceforge.bprocessor.model.Space;
- import net.sourceforge.bprocessor.model.Item;
- 
  import org.apache.log4j.Logger;
  
--- 28,31 ----
***************
*** 121,125 ****
        } else if (lfile.getName().endsWith(".obj")) {
          try {
!           Space s = Item.createUnion(lfile.getName());
            //Component lo = new Component(Byte.MAX_VALUE, lfile, s);
            ImportFileReader.importObjFile(lfile, s, info.objPanel.getScale(), 
--- 119,123 ----
        } else if (lfile.getName().endsWith(".obj")) {
          try {
!           Space s = Space.createUnion(lfile.getName());
            //Component lo = new Component(Byte.MAX_VALUE, lfile, s);
            ImportFileReader.importObjFile(lfile, s, info.objPanel.getScale(), 

Index: ImportFileReader.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/ImportFileReader.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** ImportFileReader.java	25 Jun 2009 22:17:33 -0000	1.21
--- ImportFileReader.java	25 Jun 2009 23:28:46 -0000	1.22
***************
*** 31,35 ****
  import net.sourceforge.bprocessor.model.Project;
  import net.sourceforge.bprocessor.model.Space;
- import net.sourceforge.bprocessor.model.Item;
  import net.sourceforge.bprocessor.model.Surface;
  import net.sourceforge.bprocessor.model.Vertex;
--- 31,34 ----
***************
*** 406,410 ****
              }
              if (spaceid != previousSpaceId) {
!               currentSpace = Item.createConstructionSpace("Space with id " + spaceid);
                where.add(currentSpace);
                currentSpace.setClassification(new Classification("Type " + classification, -1));
--- 405,409 ----
              }
              if (spaceid != previousSpaceId) {
!               currentSpace = Space.createConstructionSpace("Space with id " + spaceid);
                where.add(currentSpace);
                currentSpace.setClassification(new Classification("Type " + classification, -1));
***************
*** 602,606 ****
       */
      public Space readFile() throws IOException {
!       output = Item.createConstructionSpace("Design");
        while (input.available() > 0) {
          readElement();
--- 601,605 ----
       */
      public Space readFile() throws IOException {
!       output = Space.createConstructionSpace("Design");
        while (input.available() > 0) {
          readElement();