[Bprocessor-commit] gui/src/net/sourceforge/bprocessor/gui/actions CreateConstructionSpaceActionListener.java,1.5,1.6 ToolsDetachActionListener.java,1.5,1.6 CreateFunctionalSpaceActionListener.java,1.5,1.6 ToolsJoinActionListener.java,1.5,1.6

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

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

Modified Files:
	CreateConstructionSpaceActionListener.java 
	ToolsDetachActionListener.java 
	CreateFunctionalSpaceActionListener.java 
	ToolsJoinActionListener.java 
Log Message:
Removed some usage of ConstructionSpace/FunctionalSpace

Index: ToolsDetachActionListener.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/ToolsDetachActionListener.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ToolsDetachActionListener.java	11 Dec 2005 17:27:54 -0000	1.5
--- ToolsDetachActionListener.java	12 Dec 2005 10:06:21 -0000	1.6
***************
*** 7,12 ****
  package net.sourceforge.bprocessor.gui.actions;
  
- import net.sourceforge.bprocessor.model.FunctionalSpace;
  import net.sourceforge.bprocessor.model.Project;
  
  import java.awt.BorderLayout;
--- 7,12 ----
  package net.sourceforge.bprocessor.gui.actions;
  
  import net.sourceforge.bprocessor.model.Project;
+ import net.sourceforge.bprocessor.model.Space;
  
  import java.awt.BorderLayout;
***************
*** 85,89 ****
      Iterator it = spaces.iterator();
      while (it.hasNext()) {
!       FunctionalSpace fs = (FunctionalSpace)it.next();
        leftValuesData.add(new ValueHolder(fs.getId(), fs.getName()));
      }
--- 85,89 ----
      Iterator it = spaces.iterator();
      while (it.hasNext()) {
!       Space fs = (Space)it.next();
        leftValuesData.add(new ValueHolder(fs.getId(), fs.getName()));
      }

Index: CreateConstructionSpaceActionListener.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/CreateConstructionSpaceActionListener.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CreateConstructionSpaceActionListener.java	2 Oct 2005 14:37:10 -0000	1.5
--- CreateConstructionSpaceActionListener.java	12 Dec 2005 10:06:21 -0000	1.6
***************
*** 10,13 ****
--- 10,14 ----
  import net.sourceforge.bprocessor.model.ConstructionSpace;
  import net.sourceforge.bprocessor.model.Project;
+ import net.sourceforge.bprocessor.model.Space;
  
  import java.awt.event.ActionEvent;
***************
*** 44,48 ****
  
      if (result != null && !result.trim().equals("")) {
!       ConstructionSpace cs = new ConstructionSpace(result.trim());
        Project.getInstance().intern(cs);
      }
--- 45,49 ----
  
      if (result != null && !result.trim().equals("")) {
!       Space cs = new ConstructionSpace(result.trim());
        Project.getInstance().intern(cs);
      }

Index: CreateFunctionalSpaceActionListener.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/CreateFunctionalSpaceActionListener.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CreateFunctionalSpaceActionListener.java	2 Oct 2005 14:37:10 -0000	1.5
--- CreateFunctionalSpaceActionListener.java	12 Dec 2005 10:06:21 -0000	1.6
***************
*** 10,13 ****
--- 10,14 ----
  import net.sourceforge.bprocessor.model.FunctionalSpace;
  import net.sourceforge.bprocessor.model.Project;
+ import net.sourceforge.bprocessor.model.Space;
  
  import java.awt.event.ActionEvent;
***************
*** 44,48 ****
  
      if (result != null && !result.trim().equals("")) {
!       FunctionalSpace fs = new FunctionalSpace(result.trim());
  
        Project.getInstance().intern(fs);
--- 45,49 ----
  
      if (result != null && !result.trim().equals("")) {
!       Space fs = new FunctionalSpace(result.trim());
  
        Project.getInstance().intern(fs);

Index: ToolsJoinActionListener.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/ToolsJoinActionListener.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ToolsJoinActionListener.java	11 Dec 2005 17:27:54 -0000	1.5
--- ToolsJoinActionListener.java	12 Dec 2005 10:06:21 -0000	1.6
***************
*** 8,13 ****
  
  
- import net.sourceforge.bprocessor.model.FunctionalSpace;
  import net.sourceforge.bprocessor.model.Project;
  import net.sourceforge.bprocessor.model.Surface;
  
--- 8,13 ----
  
  
  import net.sourceforge.bprocessor.model.Project;
+ import net.sourceforge.bprocessor.model.Space;
  import net.sourceforge.bprocessor.model.Surface;
  
***************
*** 98,102 ****
      it = fss.iterator();
      while (it.hasNext()) {
!       FunctionalSpace fs = (FunctionalSpace)it.next();
        rightValuesData.add(new ValueHolder(fs.getId(), fs.getName()));
      }
--- 98,102 ----
      it = fss.iterator();
      while (it.hasNext()) {
!       Space fs = (Space)it.next();
        rightValuesData.add(new ValueHolder(fs.getId(), fs.getName()));
      }