[Bprocessor-commit] gui/src/net/sourceforge/bprocessor/gui/actions ImportFileReader.java, 1.15, 1.16 FileImportActionListener.java, 1.17, 1.18

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

Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17301/src/net/sourceforge/bprocessor/gui/actions

Modified Files:
	ImportFileReader.java FileImportActionListener.java 
Log Message:
Instance/Container instantiated as appropriately

Index: FileImportActionListener.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/FileImportActionListener.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** FileImportActionListener.java	26 Nov 2007 18:13:30 -0000	1.17
--- FileImportActionListener.java	12 Dec 2007 12:48:31 -0000	1.18
***************
*** 27,30 ****
--- 27,31 ----
  import net.sourceforge.bprocessor.gui.GUI;
  import net.sourceforge.bprocessor.model.Component;
+ import net.sourceforge.bprocessor.model.Container;
  import net.sourceforge.bprocessor.model.Project;
  import net.sourceforge.bprocessor.model.Space;
***************
*** 108,112 ****
        } else if (lfile.getName().endsWith(".obj")) {
          try {
!           Space s = new Space(lfile.getName(), Space.CONSTRUCTION, true);
            s.setUnion(true);
            Component lo = new Component(Byte.MAX_VALUE, lfile, s);
--- 109,113 ----
        } else if (lfile.getName().endsWith(".obj")) {
          try {
!           Space s = new Container(lfile.getName(), Space.CONSTRUCTION, true);
            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.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** ImportFileReader.java	23 Nov 2007 10:35:39 -0000	1.15
--- ImportFileReader.java	12 Dec 2007 12:48:31 -0000	1.16
***************
*** 25,28 ****
--- 25,29 ----
  
  import net.sourceforge.bprocessor.model.Classification;
+ import net.sourceforge.bprocessor.model.Container;
  import net.sourceforge.bprocessor.model.CoordinateSystem;
  import net.sourceforge.bprocessor.model.Edge;
***************
*** 404,408 ****
              }
              if (spaceid != previousSpaceId) {
!               currentSpace = new Space("Space with id " + spaceid, 
                    Space.CONSTRUCTION, true);
                where.add(currentSpace);
--- 405,409 ----
              }
              if (spaceid != previousSpaceId) {
!               currentSpace = new Container("Space with id " + spaceid, 
                    Space.CONSTRUCTION, true);
                where.add(currentSpace);