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

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

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

Modified Files:
	ImportFileReader.java FileImportActionListener.java 
Log Message:
Refactor

Index: FileImportActionListener.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/FileImportActionListener.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** FileImportActionListener.java	3 Apr 2008 14:01:18 -0000	1.21
--- FileImportActionListener.java	3 Nov 2008 13:14:12 -0000	1.22
***************
*** 29,32 ****
--- 29,33 ----
  import net.sourceforge.bprocessor.model.Project;
  import net.sourceforge.bprocessor.model.Container;
+ import net.sourceforge.bprocessor.model.Space;
  
  import org.apache.log4j.Logger;
***************
*** 121,125 ****
        } else if (lfile.getName().endsWith(".obj")) {
          try {
!           Container s = new Container(lfile.getName(), Container.CONSTRUCTION, true);
            s.setUnion(true);
            Component lo = new Component(Byte.MAX_VALUE, lfile, s);
--- 122,126 ----
        } else if (lfile.getName().endsWith(".obj")) {
          try {
!           Container s = Space.createConstructionSpace(lfile.getName());
            s.setUnion(true);
            Component lo = new Component(Byte.MAX_VALUE, lfile, s);

Index: ImportFileReader.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/ImportFileReader.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** ImportFileReader.java	3 Apr 2008 14:01:18 -0000	1.18
--- ImportFileReader.java	3 Nov 2008 13:14:12 -0000	1.19
***************
*** 31,34 ****
--- 31,35 ----
  import net.sourceforge.bprocessor.model.Project;
  import net.sourceforge.bprocessor.model.Container;
+ import net.sourceforge.bprocessor.model.Space;
  import net.sourceforge.bprocessor.model.Surface;
  import net.sourceforge.bprocessor.model.Vertex;
***************
*** 405,410 ****
              }
              if (spaceid != previousSpaceId) {
!               currentSpace = new Container("Space with id " + spaceid, 
!                   Container.CONSTRUCTION, true);
                where.add(currentSpace);
                currentSpace.setClassification(new Classification("Type " + classification, -1));
--- 406,410 ----
              }
              if (spaceid != previousSpaceId) {
!               currentSpace = Space.createConstructionSpace("Space with id " + spaceid);
                where.add(currentSpace);
                currentSpace.setClassification(new Classification("Type " + classification, -1));
***************
*** 602,606 ****
       */
      public Container readFile() throws IOException {
!       output = new Container("Design", Container.CONSTRUCTION, true);
        while (input.available() > 0) {
          readElement();
--- 602,606 ----
       */
      public Container readFile() throws IOException {
!       output = Space.createConstructionSpace("Design");
        while (input.available() > 0) {
          readElement();