bprocessor-commit

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

Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3215/src/net/sourceforge/bprocessor/gl/tool

Modified Files:
	PasteActionListener.java ShiftActionListener.java 
	ExtrusionTool.java CopyActionListener.java 
	DomainPopupListener.java SelectTool.java 
Log Message:
Surface is now related to Space instead of Domain

Index: PasteActionListener.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/PasteActionListener.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PasteActionListener.java	3 Nov 2005 11:11:23 -0000	1.2
--- PasteActionListener.java	11 Dec 2005 17:50:58 -0000	1.3
***************
*** 11,16 ****
  
  import net.sourceforge.bprocessor.gl.view.View;
  import net.sourceforge.bprocessor.model.Surface;
- import net.sourceforge.bprocessor.model.Domain;
  import net.sourceforge.bprocessor.model.Project;
  
--- 11,16 ----
  
  import net.sourceforge.bprocessor.gl.view.View;
+ import net.sourceforge.bprocessor.model.Space;
  import net.sourceforge.bprocessor.model.Surface;
  import net.sourceforge.bprocessor.model.Project;
  
***************
*** 48,53 ****
     */
    public void actionPerformed(ActionEvent e) {
!     Domain facing = CopyActionListener.getFacing();
!     Domain nonFacing = CopyActionListener.getNonFacing();
      if (view.facingFront(surface)) {
        surface.setFrontDomain(facing);
--- 48,53 ----
     */
    public void actionPerformed(ActionEvent e) {
!     Space facing = CopyActionListener.getFacing();
!     Space nonFacing = CopyActionListener.getNonFacing();
      if (view.facingFront(surface)) {
        surface.setFrontDomain(facing);

Index: DomainPopupListener.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/DomainPopupListener.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DomainPopupListener.java	3 Nov 2005 11:11:23 -0000	1.2
--- DomainPopupListener.java	11 Dec 2005 17:50:58 -0000	1.3
***************
*** 10,15 ****
  import java.awt.event.ActionListener;
  
! import net.sourceforge.bprocessor.model.Domain;
  import net.sourceforge.bprocessor.model.Project;
  import net.sourceforge.bprocessor.model.Surface;
  
--- 10,16 ----
  import java.awt.event.ActionListener;
  
! 
  import net.sourceforge.bprocessor.model.Project;
+ import net.sourceforge.bprocessor.model.Space;
  import net.sourceforge.bprocessor.model.Surface;
  
***************
*** 24,28 ****
    
    /** The domain */
!   private Domain domain;
    
    /** The Surface */
--- 25,29 ----
    
    /** The domain */
!   private Space domain;
    
    /** The Surface */
***************
*** 39,43 ****
     * @param front werther or not this popup for the front of the back of the surface
     */
!   public DomainPopupListener(Domain domain, Surface surface, boolean front) {
      this.domain = domain;
      this.surface = surface;
--- 40,44 ----
     * @param front werther or not this popup for the front of the back of the surface
     */
!   public DomainPopupListener(Space domain, Surface surface, boolean front) {
      this.domain = domain;
      this.surface = surface;
***************
*** 51,55 ****
    public void actionPerformed(ActionEvent arg0) {
      if (front) {
!       Domain oldFront = surface.getFrontDomain();
        surface.setFrontDomain(domain);
        if (domain != null) {
--- 52,56 ----
    public void actionPerformed(ActionEvent arg0) {
      if (front) {
!       Space oldFront = surface.getFrontDomain();
        surface.setFrontDomain(domain);
        if (domain != null) {
***************
*** 60,64 ****
        }
      } else {
!       Domain oldBack = surface.getBackDomain();
        surface.setBackDomain(domain);
        if (domain != null) {
--- 61,65 ----
        }
      } else {
!       Space oldBack = surface.getBackDomain();
        surface.setBackDomain(domain);
        if (domain != null) {

Index: CopyActionListener.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/CopyActionListener.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CopyActionListener.java	3 Nov 2005 11:11:23 -0000	1.2
--- CopyActionListener.java	11 Dec 2005 17:50:58 -0000	1.3
***************
*** 11,16 ****
  
  import net.sourceforge.bprocessor.gl.view.View;
  import net.sourceforge.bprocessor.model.Surface;
- import net.sourceforge.bprocessor.model.Domain;
  
  import org.apache.log4j.Logger;
--- 11,16 ----
  
  import net.sourceforge.bprocessor.gl.view.View;
+ import net.sourceforge.bprocessor.model.Space;
  import net.sourceforge.bprocessor.model.Surface;
  
  import org.apache.log4j.Logger;
***************
*** 27,35 ****
     * The copied domain facing the camera
     */
!   private static Domain facing = null;
    /**
     * The copied domain not facing the camera
     */
!   private static Domain nonFacing = null;
    /**
     * The surface this listener shifts spaces on
--- 27,35 ----
     * The copied domain facing the camera
     */
!   private static Space facing = null;
    /**
     * The copied domain not facing the camera
     */
!   private static Space nonFacing = null;
    /**
     * The surface this listener shifts spaces on
***************
*** 66,70 ****
     * @return the domain
     */
!   public static Domain getFacing() {
      return facing;
    }
--- 66,70 ----
     * @return the domain
     */
!   public static Space getFacing() {
      return facing;
    }
***************
*** 73,77 ****
     * @return the domain
     */
!   public static Domain getNonFacing() {
      return nonFacing;
    }
--- 73,77 ----
     * @return the domain
     */
!   public static Space getNonFacing() {
      return nonFacing;
    }

Index: SelectTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SelectTool.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** SelectTool.java	28 Nov 2005 22:24:50 -0000	1.44
--- SelectTool.java	11 Dec 2005 17:50:58 -0000	1.45
***************
*** 237,241 ****
        boolean constEnabled = false;
        while (domIt.hasNext()) {
!         Domain domain = (Domain)domIt.next();
          if (domain instanceof Space) {
            JMenuItem domainItem = new JMenuItem(domain.getName());
--- 237,241 ----
        boolean constEnabled = false;
        while (domIt.hasNext()) {
!         Space domain = (Space)domIt.next();
          if (domain instanceof Space) {
            JMenuItem domainItem = new JMenuItem(domain.getName());

Index: ExtrusionTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ExtrusionTool.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** ExtrusionTool.java	28 Nov 2005 22:24:50 -0000	1.32
--- ExtrusionTool.java	11 Dec 2005 17:50:58 -0000	1.33
***************
*** 17,23 ****
  import net.sourceforge.bprocessor.model.Edge;
  import net.sourceforge.bprocessor.model.Project;
  import net.sourceforge.bprocessor.model.Surface;
  import net.sourceforge.bprocessor.model.Vertex;
- import net.sourceforge.bprocessor.model.Domain;
  import net.sourceforge.bprocessor.model.Plane;
  
--- 17,23 ----
  import net.sourceforge.bprocessor.model.Edge;
  import net.sourceforge.bprocessor.model.Project;
+ import net.sourceforge.bprocessor.model.Space;
  import net.sourceforge.bprocessor.model.Surface;
  import net.sourceforge.bprocessor.model.Vertex;
  import net.sourceforge.bprocessor.model.Plane;
  
***************
*** 422,427 ****
      Surface bottom = (Surface)extrudedSurfaces.getLast();
      Vertex dir = top.center().minus(bottom.center());
!     Domain front = bottom.getFrontDomain();
!     Domain back = bottom.getBackDomain();
      assignSpaces(extrudedSurfaces);
      
--- 422,427 ----
      Surface bottom = (Surface)extrudedSurfaces.getLast();
      Vertex dir = top.center().minus(bottom.center());
!     Space front = bottom.getFrontDomain();
!     Space back = bottom.getBackDomain();
      assignSpaces(extrudedSurfaces);
      
***************
*** 457,462 ****
        Surface top = (Surface)surfaces.getFirst();
        Surface bottom = (Surface)surfaces.getLast();
!       Domain front = bottom.getFrontDomain();
!       Domain back = bottom.getBackDomain();
        surfaces.removeLast();
        Vertex norm = bottom.normal();
--- 457,462 ----
        Surface top = (Surface)surfaces.getFirst();
        Surface bottom = (Surface)surfaces.getLast();
!       Space front = bottom.getFrontDomain();
!       Space back = bottom.getBackDomain();
        surfaces.removeLast();
        Vertex norm = bottom.normal();
***************
*** 474,478 ****
     * @param surfaces the set of surfaces
     */
!   private void assignBacks(Domain back, LinkedList surfaces) {
      Iterator surfIt = surfaces.iterator();
      while (surfIt.hasNext()) {
--- 474,478 ----
     * @param surfaces the set of surfaces
     */
!   private void assignBacks(Space back, LinkedList surfaces) {
      Iterator surfIt = surfaces.iterator();
      while (surfIt.hasNext()) {
***************
*** 491,495 ****
     * @param surfaces the set of surfaces
     */
!   private void assignFronts(Domain front, LinkedList surfaces) {
      Iterator surfIt = surfaces.iterator();
      while (surfIt.hasNext()) { 
--- 491,495 ----
     * @param surfaces the set of surfaces
     */
!   private void assignFronts(Space front, LinkedList surfaces) {
      Iterator surfIt = surfaces.iterator();
      while (surfIt.hasNext()) { 

Index: ShiftActionListener.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ShiftActionListener.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ShiftActionListener.java	3 Nov 2005 11:11:23 -0000	1.2
--- ShiftActionListener.java	11 Dec 2005 17:50:58 -0000	1.3
***************
*** 10,15 ****
  import java.awt.event.ActionListener;
  
  import net.sourceforge.bprocessor.model.Surface;
- import net.sourceforge.bprocessor.model.Domain;
  import net.sourceforge.bprocessor.model.Project;
  
--- 10,15 ----
  import java.awt.event.ActionListener;
  
+ import net.sourceforge.bprocessor.model.Space;
  import net.sourceforge.bprocessor.model.Surface;
  import net.sourceforge.bprocessor.model.Project;
  
***************
*** 43,48 ****
     */
    public void actionPerformed(ActionEvent e) {
!     Domain back = surface.getBackDomain();
!     Domain front = surface.getFrontDomain();
      
      surface.setFrontDomain(back);
--- 43,48 ----
     */
    public void actionPerformed(ActionEvent e) {
!     Space back = surface.getBackDomain();
!     Space front = surface.getFrontDomain();
      
      surface.setFrontDomain(back);