[Bprocessor-commit] /model/src/net/sourceforge/bprocessor/model Line.java, 1.29, 1.30 Project.java, 1.104, 1.105 CoordinateSystem.java, 1.32, 1.33 Entity.java, 1.12, 1.13 Edge.java, 1.68, 1.69 Vertex.java, 1.52, 1.53 ClippingPlane.java, 1.15, 1.16 Cylinder.java, 1.1, 1.2 Surface.java, 1.127, 1.128 Space.java, 1.107, 1.108 Point.java, 1.13, 1.14 Plane.java, 1.27, 1.28 Constructor.java, 1.14, 1.15

[rimestad <rim...@us...>]

Update of /cvsroot/bprocessor//model/src/net/sourceforge/bprocessor/model
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv20432/src/net/sourceforge/bprocessor/model

Modified Files:
	Line.java Project.java CoordinateSystem.java Entity.java 
	Edge.java Vertex.java ClippingPlane.java Cylinder.java 
	Surface.java Space.java Point.java Plane.java Constructor.java 
Log Message:
Changed the javadoc to use inheritdoc and not see

Index: Constructor.java
===================================================================
RCS file: /cvsroot/bprocessor//model/src/net/sourceforge/bprocessor/model/Constructor.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Constructor.java	12 Nov 2006 22:57:06 -0000	1.14
--- Constructor.java	2 Jan 2007 17:48:58 -0000	1.15
***************
*** 103,109 ****
    }
    
!   /**
!    * @see net.sourceforge.bprocessor.model.Geometric#collect()
!    */
    public Set collect() {
      Set res = new HashSet();
--- 103,107 ----
    }
    
!   /** {@inheritDoc} */
    public Set collect() {
      Set res = new HashSet();
***************
*** 119,130 ****
    }
    
!   /**
!    * @see net.sourceforge.bprocessor.model.Entity#center()
!    */
    public abstract Vertex center();
    
!   /**
!    * @see net.sourceforge.bprocessor.model.Entity#delete()
!    */
    public abstract void delete();
  
--- 117,124 ----
    }
    
!   /** {@inheritDoc} */
    public abstract Vertex center();
    
!   /** {@inheritDoc} */
    public abstract void delete();
  
***************
*** 185,189 ****
    }  
    
!   /** @see net.sourceforge.bprocessor.model.Geometric#move(double, double, double) */
    public void move(double x, double y, double z) {
      Iterator it = collect().iterator();
--- 179,183 ----
    }  
    
!   /** {@inheritDoc} */
    public void move(double x, double y, double z) {
      Iterator it = collect().iterator();
***************
*** 235,239 ****
      }
      
!     /** @see net.sourceforge.bprocessor.model.Geometric#move(double, double, double) */
      public void move(double x, double y, double z) {
        parent().move(x, y, z);
--- 229,233 ----
      }
      
!     /** {@inheritDoc} */
      public void move(double x, double y, double z) {
        parent().move(x, y, z);
***************
*** 241,245 ****
      }
      
!     /** @see net.sourceforge.bprocessor.model.Geometric#move(double, double, double) */
      public Vertex canMove(double x, double y, double z, Collection entities) {
        return parent().canMove(x, y, z, entities);
--- 235,239 ----
      }
      
!     /** {@inheritDoc} */
      public Vertex canMove(double x, double y, double z, Collection entities) {
        return parent().canMove(x, y, z, entities);

Index: CoordinateSystem.java
===================================================================
RCS file: /cvsroot/bprocessor//model/src/net/sourceforge/bprocessor/model/CoordinateSystem.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** CoordinateSystem.java	11 Dec 2006 10:44:47 -0000	1.32
--- CoordinateSystem.java	2 Jan 2007 17:48:58 -0000	1.33
***************
*** 80,84 ****
    }
  
!   /** @see net.sourceforge.bprocessor.model.Geometric#move(double, double, double) */
    public Vertex canMove(double x, double y, double z, Collection entities) {
      // TODO Think it through
--- 80,84 ----
    }
  
!   /** {@inheritDoc} */
    public Vertex canMove(double x, double y, double z, Collection entities) {
      // TODO Think it through
***************
*** 312,332 ****
    }
  
!    /**
!    * @see net.sourceforge.bprocessor.model.Entity#center()
!    */
    public Vertex center() {
      return getOrigin();
    }
  
!   /**
!    * @see net.sourceforge.bprocessor.model.Entity#delete()
!    */
    public void delete() {
      getOwner().remove(this);
    }
  
!   /**
!    * @see net.sourceforge.bprocessor.model.Parametric#setAttributes()
!    */
    public void setAttributes(List attributes) {
      Vertex orig = new Vertex(0, 0, 0);
--- 312,326 ----
    }
  
!   /** {@inheritDoc} */
    public Vertex center() {
      return getOrigin();
    }
  
!   /** {@inheritDoc} */
    public void delete() {
      getOwner().remove(this);
    }
  
!   /** {@inheritDoc} */
    public void setAttributes(List attributes) {
      Vertex orig = new Vertex(0, 0, 0);
***************
*** 365,371 ****
    }
    
!   /**
!    * @see net.sourceforge.bprocessor.model.Parametric#getAttributes()
!    */
    public List getAttributes() {
      ArrayList res = new ArrayList();
--- 359,363 ----
    }
    
!   /** {@inheritDoc} */
    public List getAttributes() {
      ArrayList res = new ArrayList();
***************
*** 401,407 ****
    }
  
!   /**
!    * @see net.sourceforge.bprocessor.model.Parametric#getGeneralName()
!    */
    public String getGeneralName() {
      if (onlyPlane()) {
--- 393,397 ----
    }
  
!   /** {@inheritDoc} */
    public String getGeneralName() {
      if (onlyPlane()) {
***************
*** 456,460 ****
    }
  
!   /** @see net.sourceforge.bprocessor.model.Geometric#getName() */
    public String getName() {
      return "CS-" + getId();
--- 446,450 ----
    }
  
!   /** {@inheritDoc} */
    public String getName() {
      return "CS-" + getId();

Index: Surface.java
===================================================================
RCS file: /cvsroot/bprocessor//model/src/net/sourceforge/bprocessor/model/Surface.java,v
retrieving revision 1.127
retrieving revision 1.128
diff -C2 -d -r1.127 -r1.128
*** Surface.java	12 Dec 2006 13:59:14 -0000	1.127
--- Surface.java	2 Jan 2007 17:48:58 -0000	1.128
***************
*** 1165,1169 ****
    }
  
!   /** @see net.sourceforge.bprocessor.model.Geometric#move(double, double, double) */
    public Vertex canMove(double x, double y, double z, Collection entities) {
      Vertex dir = new Vertex(x, y, z);
--- 1165,1169 ----
    }
  
!   /** {@inheritDoc} */
    public Vertex canMove(double x, double y, double z, Collection entities) {
      Vertex dir = new Vertex(x, y, z);
***************
*** 1698,1704 ****
    }
  
!   /**
!    * @see net.sourceforge.bprocessor.model.Parametric#getGeneralName()
!    */
    public String getGeneralName() {
      if (getOwner() == Project.getInstance().world()) {
--- 1698,1702 ----
    }
  
!   /** {@inheritDoc} */
    public String getGeneralName() {
      if (getOwner() == Project.getInstance().world()) {

Index: Edge.java
===================================================================
RCS file: /cvsroot/bprocessor//model/src/net/sourceforge/bprocessor/model/Edge.java,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** Edge.java	29 Dec 2006 15:17:59 -0000	1.68
--- Edge.java	2 Jan 2007 17:48:58 -0000	1.69
***************
*** 298,302 ****
    }
    
!   /** @see net.sourceforge.bprocessor.model.Geometric#move(double, double, double) */
    public Vertex canMove(double x, double y, double z, Collection entities) {
      // TODO Think it through
--- 298,302 ----
    }
    
!   /** {@inheritDoc} */
    public Vertex canMove(double x, double y, double z, Collection entities) {
      // TODO Think it through
***************
*** 607,613 ****
    }
  
!   /**
!    * @see net.sourceforge.bprocessor.model.Parametric#getGeneralName()
!    */
    public String getGeneralName() {
      return "Edge";
--- 607,611 ----
    }
  
!   /** {@inheritDoc} */
    public String getGeneralName() {
      return "Edge";

Index: ClippingPlane.java
===================================================================
RCS file: /cvsroot/bprocessor//model/src/net/sourceforge/bprocessor/model/ClippingPlane.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** ClippingPlane.java	18 Dec 2006 09:11:46 -0000	1.15
--- ClippingPlane.java	2 Jan 2007 17:48:58 -0000	1.16
***************
*** 300,304 ****
    }
  
!   /** @see net.sourceforge.bprocessor.model.Geometric#move(double, double, double) */
    public void move(double x, double y, double z) {
      center().move(x, y, z);
--- 300,304 ----
    }
  
!   /** {@inheritDoc} */
    public void move(double x, double y, double z) {
      center().move(x, y, z);
***************
*** 306,317 ****
    }
  
!   /** @see net.sourceforge.bprocessor.model.Geometric#canMove(double, double, double, Collection) */
    public Vertex canMove(double x, double y, double z, Collection entities) {
      return new Vertex(x, y, z).projectOnto(plane.normal());
    }
  
!   /**
!    * @see net.sourceforge.bprocessor.model.Parametric#getAttributes()
!    */
    public List getAttributes() {
      ArrayList res = new ArrayList();
--- 306,315 ----
    }
  
!   /** {@inheritDoc} */
    public Vertex canMove(double x, double y, double z, Collection entities) {
      return new Vertex(x, y, z).projectOnto(plane.normal());
    }
  
!   /** {@inheritDoc} */
    public List getAttributes() {
      ArrayList res = new ArrayList();
***************
*** 330,336 ****
    }
  
!   /**
!    * @see net.sourceforge.bprocessor.model.Parametric#getGeneralName()
!    */
    public String getGeneralName() {
      String s = "Clippingplane";
--- 328,332 ----
    }
  
!   /** {@inheritDoc} */
    public String getGeneralName() {
      String s = "Clippingplane";
***************
*** 338,344 ****
    }
  
!   /**
!    * @see net.sourceforge.bprocessor.model.Parametric#setAttributes(List)
!    */
    public void setAttributes(List attributes) {
      Iterator iter = attributes.iterator();
--- 334,338 ----
    }
  
!   /** {@inheritDoc} */
    public void setAttributes(List attributes) {
      Iterator iter = attributes.iterator();

Index: Point.java
===================================================================
RCS file: /cvsroot/bprocessor//model/src/net/sourceforge/bprocessor/model/Point.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Point.java	3 Dec 2006 17:51:23 -0000	1.13
--- Point.java	2 Jan 2007 17:48:58 -0000	1.14
***************
*** 30,35 ****
      super();
    }
! 
!   /** @see net.sourceforge.bprocessor.model.Geometric#move(double, double, double) */
    public Vertex canMove(double x, double y, double z, Collection entities) {
      // TODO Think it through
--- 30,35 ----
      super();
    }
!   
!   /** {@inheritDoc} */
    public Vertex canMove(double x, double y, double z, Collection entities) {
      // TODO Think it through
***************
*** 52,58 ****
    }
  
!   /**
!    * @see net.sourceforge.bprocessor.model.Parametric#setAttributes()
!    */
    public void setAttributes(List attributes) {
      Vertex orig = getOrigin();
--- 52,56 ----
    }
  
!   /** {@inheritDoc} */
    public void setAttributes(List attributes) {
      Vertex orig = getOrigin();
***************
*** 62,68 ****
    }
  
!   /**
!    * @see net.sourceforge.bprocessor.model.Parametric#getAttributes()
!    */
    public List getAttributes() {
      ArrayList res = new ArrayList();
--- 60,64 ----
    }
  
!   /** {@inheritDoc} */
    public List getAttributes() {
      ArrayList res = new ArrayList();
***************
*** 73,84 ****
    }
  
!   /**
!    * @see net.sourceforge.bprocessor.model.Parametric#getGeneralName()
!    */
    public String getGeneralName() {
      return "B-Point";
    }
    
!   /** @see net.sourceforge.bprocessor.model.Geometric#getName() */
    public String getName() {
      return "P-" + getId();
--- 69,78 ----
    }
  
!   /** {@inheritDoc} */
    public String getGeneralName() {
      return "B-Point";
    }
    
!   /** {@inheritDoc} */
    public String getName() {
      return "P-" + getId();

Index: Plane.java
===================================================================
RCS file: /cvsroot/bprocessor//model/src/net/sourceforge/bprocessor/model/Plane.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** Plane.java	13 Dec 2006 17:45:17 -0000	1.27
--- Plane.java	2 Jan 2007 17:48:58 -0000	1.28
***************
*** 256,265 ****
        result = Y;
        coefficient = Math.abs(b);
!     };
      
      if (Math.abs(c) > coefficient) {
        result = Z;
        coefficient = Math.abs(c);
!     };
      
      return result;
--- 256,265 ----
        result = Y;
        coefficient = Math.abs(b);
!     }
      
      if (Math.abs(c) > coefficient) {
        result = Z;
        coefficient = Math.abs(c);
!     }
      
      return result;

Index: Project.java
===================================================================
RCS file: /cvsroot/bprocessor//model/src/net/sourceforge/bprocessor/model/Project.java,v
retrieving revision 1.104
retrieving revision 1.105
diff -C2 -d -r1.104 -r1.105
*** Project.java	30 Dec 2006 15:30:35 -0000	1.104
--- Project.java	2 Jan 2007 17:48:58 -0000	1.105
***************
*** 769,775 ****
  
  
!   /**
!    * @see net.sourceforge.bprocessor.model.Parametric#getGeneralName()
!    */
    public String getGeneralName() {
      return "Project";
--- 769,773 ----
  
  
!   /** {@inheritDoc} */
    public String getGeneralName() {
      return "Project";
***************
*** 827,838 ****
      BufferedReader bf;
      if (construction) {
!       bf = new BufferedReader
!         (new InputStreamReader(new FileInputStream("construction2.txt"), "ISO-8859-1"));
        clas = new Classification(0);
        parent  = new Classification(0);
        last = new Classification(0); 
      } else {
!       bf = new BufferedReader
!         (new InputStreamReader(new FileInputStream("functionals.txt"), "ISO-8859-1"));
        clas = new Classification(1);
        parent  = new Classification(1);
--- 825,836 ----
      BufferedReader bf;
      if (construction) {
!       bf = new BufferedReader(
!           new InputStreamReader(new FileInputStream("construction2.txt"), "ISO-8859-1"));
        clas = new Classification(0);
        parent  = new Classification(0);
        last = new Classification(0); 
      } else {
!       bf = new BufferedReader(
!           new InputStreamReader(new FileInputStream("functionals.txt"), "ISO-8859-1"));
        clas = new Classification(1);
        parent  = new Classification(1);

Index: Space.java
===================================================================
RCS file: /cvsroot/bprocessor//model/src/net/sourceforge/bprocessor/model/Space.java,v
retrieving revision 1.107
retrieving revision 1.108
diff -C2 -d -r1.107 -r1.108
*** Space.java	17 Dec 2006 20:23:36 -0000	1.107
--- Space.java	2 Jan 2007 17:48:58 -0000	1.108
***************
*** 1583,1589 ****
    }
    
!   /**
!    * @see net.sourceforge.bprocessor.model.Parametric#getGeneralName()
!    */
    public String getGeneralName() {
      if (proto != null) {
--- 1583,1587 ----
    }
    
!   /** {@inheritDoc} */
    public String getGeneralName() {
      if (proto != null) {
***************
*** 2280,2285 ****
      }
    }
! 
!   /** @see net.sourceforge.bprocessor.model.Geometric#move(double, double, double)*/
    public void move(double x, double y, double z) {
      Iterator iter = collect().iterator();
--- 2278,2283 ----
      }
    }
!   
!   /** {@inheritDoc} */
    public void move(double x, double y, double z) {
      Iterator iter = collect().iterator();
***************
*** 2289,2293 ****
    }
    
!   /** @see net.sourceforge.bprocessor.model.Geometric#move(double, double, double) */
    public Vertex canMove(double x, double y, double z, Collection entities) {
      // TODO Think it through
--- 2287,2291 ----
    }
    
!   /** {@inheritDoc} */
    public Vertex canMove(double x, double y, double z, Collection entities) {
      // TODO Think it through

Index: Line.java
===================================================================
RCS file: /cvsroot/bprocessor//model/src/net/sourceforge/bprocessor/model/Line.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** Line.java	13 Dec 2006 17:44:16 -0000	1.29
--- Line.java	2 Jan 2007 17:48:58 -0000	1.30
***************
*** 127,133 ****
    }
  
!   /**
!    * @see net.sourceforge.bprocessor.model.Parametric#setAttributes()
!    */
    public void setAttributes(List attributes) {
      Vertex orig = new Vertex(0, 0, 0);
--- 127,131 ----
    }
  
!   /** {@inheritDoc} */
    public void setAttributes(List attributes) {
      Vertex orig = new Vertex(0, 0, 0);
***************
*** 149,155 ****
    }
  
!   /**
!    * @see net.sourceforge.bprocessor.model.Parametric#getAttributes()
!    */
    public List getAttributes() {
      ArrayList res = new ArrayList();
--- 147,151 ----
    }
  
!   /** {@inheritDoc} */
    public List getAttributes() {
      ArrayList res = new ArrayList();
***************
*** 188,194 ****
    }
    
!   /**
!    * @see net.sourceforge.bprocessor.model.Parametric#getGeneralName()
!    */
    public String getGeneralName() {
      return "B-Line";
--- 184,188 ----
    }
    
!   /** {@inheritDoc} */
    public String getGeneralName() {
      return "B-Line";
***************
*** 203,216 ****
    }
  
!   /**
!    * @see @see net.sourceforge.bprocessor.model.Geometry#degreesAboutY(Vertex)
!    */
    public double degreesAboutY() {
      return Geometry.degreesAboutY(dir);
    }
  
!   /**
!    * @see @see net.sourceforge.bprocessor.model.Geometry#degreesAboutZ(Vertex)
!    */
    public double degreesAboutZ() {
      return Geometry.degreesAboutZ(dir);
--- 197,206 ----
    }
  
!   /** {@inheritDoc} */
    public double degreesAboutY() {
      return Geometry.degreesAboutY(dir);
    }
  
!   /** {@inheritDoc} */
    public double degreesAboutZ() {
      return Geometry.degreesAboutZ(dir);
***************
*** 405,414 ****
    }
  
!   /** @see net.sourceforge.bprocessor.model.Geometric#getName() */
    public String getName() {
      return "L-" + getId();
    }
    
!   /** @see net.sourceforge.bprocessor.model.Geometric#move(double, double, double) */
    public Vertex canMove(double x, double y, double z, Collection entities) {
      // TODO Think it through
--- 395,404 ----
    }
  
!   /** {@inheritDoc} */
    public String getName() {
      return "L-" + getId();
    }
    
!   /** {@inheritDoc} */
    public Vertex canMove(double x, double y, double z, Collection entities) {
      // TODO Think it through

Index: Vertex.java
===================================================================
RCS file: /cvsroot/bprocessor//model/src/net/sourceforge/bprocessor/model/Vertex.java,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** Vertex.java	8 Dec 2006 10:53:31 -0000	1.52
--- Vertex.java	2 Jan 2007 17:48:58 -0000	1.53
***************
*** 458,464 ****
    }
  
!   /**
!    * @see net.sourceforge.bprocessor.model.Parametric#getGeneralName()
!    */
    public String getGeneralName() {
      return "Vertex";
--- 458,462 ----
    }
  
!   /** {@inheritDoc} */
    public String getGeneralName() {
      return "Vertex";
***************
*** 534,538 ****
    }
  
!   /** @see net.sourceforge.bprocessor.model.Geometric#move(double, double, double) */
    public Vertex canMove(double x, double y, double z, Collection entities) {
      // TODO Think it through
--- 532,536 ----
    }
  
!   /** {@inheritDoc} */
    public Vertex canMove(double x, double y, double z, Collection entities) {
      // TODO Think it through

Index: Cylinder.java
===================================================================
RCS file: /cvsroot/bprocessor//model/src/net/sourceforge/bprocessor/model/Cylinder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Cylinder.java	30 Oct 2006 10:34:21 -0000	1.1
--- Cylinder.java	2 Jan 2007 17:48:58 -0000	1.2
***************
*** 119,128 ****
    }
  
!   /** @see net.sourceforge.bprocessor.model.Parametric#setAttributes(List) */
    public void setAttributes(List attributes) {
      // TODO Auto-generated method stub
    }
  
!   /** @see net.sourceforge.bprocessor.model.Parametric#getGeneralName() */
    public List getAttributes() {
      // TODO Auto-generated method stub
--- 119,128 ----
    }
  
!   /** {@inheritDoc} */
    public void setAttributes(List attributes) {
      // TODO Auto-generated method stub
    }
  
!   /** {@inheritDoc} */
    public List getAttributes() {
      // TODO Auto-generated method stub
***************
*** 130,134 ****
    }
    
!   /** @see net.sourceforge.bprocessor.model.modellor.Modellor#newInstance(Space) */
    public Modellor newInstance(Space s) {
      // TODO Auto-generated method stub
--- 130,134 ----
    }
    
!   /** {@inheritDoc} */
    public Modellor newInstance(Space s) {
      // TODO Auto-generated method stub
***************
*** 136,140 ****
    }
    
!   /** @see net.sourceforge.bprocessor.model.modellor.Modellor#setContent(Map) */
    public void setContent(Map m) {
      axisDivisions = ((Integer)m.get("Axis")).intValue();
--- 136,140 ----
    }
    
!   /** {@inheritDoc} */
    public void setContent(Map m) {
      axisDivisions = ((Integer)m.get("Axis")).intValue();
***************
*** 142,147 ****
      radius = ((Double)m.get("Radius")).doubleValue();
    }
! 
!   /** @see net.sourceforge.bprocessor.model.modellor.Modellor#getContent() */
    public Map getContent() {
      Map m = new HashMap();
--- 142,147 ----
      radius = ((Double)m.get("Radius")).doubleValue();
    }
!   
!   /** {@inheritDoc} */
    public Map getContent() {
      Map m = new HashMap();

Index: Entity.java
===================================================================
RCS file: /cvsroot/bprocessor//model/src/net/sourceforge/bprocessor/model/Entity.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Entity.java	21 Dec 2006 14:21:26 -0000	1.12
--- Entity.java	2 Jan 2007 17:48:58 -0000	1.13
***************
*** 66,73 ****
      final Comparator comparator = 
        new Comparator() {
!       public int compare(Object s1, Object s2) {
!         return ((Entity) s1).getId().compareTo(((Entity) s2).getId());
!       }
!     };      
      Collections.sort(entities, comparator);
    }
--- 66,73 ----
      final Comparator comparator = 
        new Comparator() {
!         public int compare(Object s1, Object s2) {
!           return ((Entity) s1).getId().compareTo(((Entity) s2).getId());
!         }
!       };      
      Collections.sort(entities, comparator);
    }