[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Line.java, 1.38, 1.39 Rotate.java, 1.7, 1.8 AxisRotate.java, 1.6, 1.7 Project.java, 1.151, 1.152 CoordinateSystem.java, 1.71, 1.72 Edge.java, 1.105, 1.106 Classification.java, 1.23, 1.24 Surface.java, 1.209, 1.210 Component.java, 1.5, 1.6 ClassificationType.java, 1.4, 1.5 TransformStack.java, 1.5, 1.6 Grid.java, 1.1, 1.2 Camera.java, 1.53, 1.54 Space.java, 1.228, 1.229 IDTransform.java, 1.3, 1.4 Point.java, 1.19, 1.20 Attribute.java, 1.25, 1.26 Command.java, 1.59, 1.60 Parametric.java, 1.5, 1.6 Relation.java, 1.8, 1.9 Vertex.java, 1.75, 1.76 Material.java, 1.11, 1.12 ClippingPlane.java, 1.26, 1.27 Translate.java, 1.6, 1.7 Scale.java, 1.7, 1.8 ParameterBlock.java, 1.14, 1.15 Transform.java, 1.5, 1.6

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

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

Modified Files:
	Line.java Rotate.java AxisRotate.java Project.java 
	CoordinateSystem.java Edge.java Classification.java 
	Surface.java Component.java ClassificationType.java 
	TransformStack.java Grid.java Camera.java Space.java 
	IDTransform.java Point.java Attribute.java Command.java 
	Parametric.java Relation.java Vertex.java Material.java 
	ClippingPlane.java Translate.java Scale.java 
	ParameterBlock.java Transform.java 
Log Message:
Renamed getGeneralName to title

Index: CoordinateSystem.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/CoordinateSystem.java,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** CoordinateSystem.java	13 Dec 2007 12:00:31 -0000	1.71
--- CoordinateSystem.java	17 Dec 2007 13:09:16 -0000	1.72
***************
*** 764,768 ****
  
    /** {@inheritDoc} */
!   public String getGeneralName() {
      return "B-System";
    }
--- 764,768 ----
  
    /** {@inheritDoc} */
!   public String title() {
      return "B-System";
    }

Index: Component.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Component.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Component.java	13 Dec 2007 12:00:31 -0000	1.5
--- Component.java	17 Dec 2007 13:09:16 -0000	1.6
***************
*** 109,113 ****
     * {@inheritDoc}
     */
!   public String getGeneralName() {
      return "Library Object";
    }
--- 109,113 ----
     * {@inheritDoc}
     */
!   public String title() {
      return "Library Object";
    }

Index: Material.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Material.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Material.java	23 Nov 2007 10:35:35 -0000	1.11
--- Material.java	17 Dec 2007 13:09:17 -0000	1.12
***************
*** 258,262 ****
     * {@inheritDoc}
     */
!   public String getGeneralName() {
      return "Material";
    }
--- 258,262 ----
     * {@inheritDoc}
     */
!   public String title() {
      return "Material";
    }

Index: Parametric.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Parametric.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Parametric.java	8 May 2007 12:35:38 -0000	1.5
--- Parametric.java	17 Dec 2007 13:09:16 -0000	1.6
***************
*** 29,35 ****
    
    /**
!    * Return the general name of the object
!    * @return The general name
     */
!   public String getGeneralName();
  }
--- 29,35 ----
    
    /**
!    * Return the title of the object
!    * @return The title
     */
!   public String title();
  }

Index: TransformStack.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/TransformStack.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TransformStack.java	12 Nov 2007 07:42:51 -0000	1.5
--- TransformStack.java	17 Dec 2007 13:09:16 -0000	1.6
***************
*** 93,100 ****
    }
  
!   /**
!    * @return Name
!    */
!   public String getGeneralName() {
      return "Transformation Stack";
    }
--- 93,98 ----
    }
  
!   /** {@inheritDoc} */
!   public String title() {
      return "Transformation Stack";
    }

Index: Point.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Point.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** Point.java	13 Nov 2007 09:46:28 -0000	1.19
--- Point.java	17 Dec 2007 13:09:16 -0000	1.20
***************
*** 55,59 ****
  
    /** {@inheritDoc} */
!   public String getGeneralName() {
      return "B-Point";
    }
--- 55,59 ----
  
    /** {@inheritDoc} */
!   public String title() {
      return "B-Point";
    }

Index: Vertex.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Vertex.java,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -d -r1.75 -r1.76
*** Vertex.java	13 Dec 2007 08:21:34 -0000	1.75
--- Vertex.java	17 Dec 2007 13:09:17 -0000	1.76
***************
*** 455,459 ****
  
    /** {@inheritDoc} */
!   public String getGeneralName() {
      return "Vertex";
    }
--- 455,459 ----
  
    /** {@inheritDoc} */
!   public String title() {
      return "Vertex";
    }

Index: Rotate.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Rotate.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Rotate.java	12 Nov 2007 07:42:51 -0000	1.7
--- Rotate.java	17 Dec 2007 13:09:15 -0000	1.8
***************
*** 138,146 ****
    }
    
!   /**
!    * Get display name
!    * @return name
!    */
!   public String getGeneralName() {
      return "Rotate";
    }
--- 138,143 ----
    }
    
!   /** {@inheritDoc} */
!   public String title() {
      return "Rotate";
    }

Index: Grid.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Grid.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Grid.java	10 Oct 2007 08:32:00 -0000	1.1
--- Grid.java	17 Dec 2007 13:09:16 -0000	1.2
***************
*** 25,30 ****
  
    /** {@inheritDoc} */
!   public String getGeneralName() {
!     return null;
    }
  
--- 25,30 ----
  
    /** {@inheritDoc} */
!   public String title() {
!     return "Grid";
    }
  

Index: Surface.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Surface.java,v
retrieving revision 1.209
retrieving revision 1.210
diff -C2 -d -r1.209 -r1.210
*** Surface.java	13 Dec 2007 12:00:31 -0000	1.209
--- Surface.java	17 Dec 2007 13:09:16 -0000	1.210
***************
*** 1916,1920 ****
  
    /** {@inheritDoc} */
!   public String getGeneralName() {
      String res = "";
      switch (getOwner().getLevel() + 1) {
--- 1916,1920 ----
  
    /** {@inheritDoc} */
!   public String title() {
      String res = "";
      switch (getOwner().getLevel() + 1) {

Index: Space.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v
retrieving revision 1.228
retrieving revision 1.229
diff -C2 -d -r1.228 -r1.229
*** Space.java	17 Dec 2007 11:21:09 -0000	1.228
--- Space.java	17 Dec 2007 13:09:16 -0000	1.229
***************
*** 519,523 ****
        Parametric parameters = getOwner().getModellor().get((Container) this);
        if (parameters != null) {
!         res.add(new Attribute(parameters.getGeneralName(), parameters));
        }
      }
--- 519,523 ----
        Parametric parameters = getOwner().getModellor().get((Container) this);
        if (parameters != null) {
!         res.add(new Attribute(parameters.title(), parameters));
        }
      }
***************
*** 526,530 ****
    
    /** {@inheritDoc} */
!   public String getGeneralName() {
      if (isInstance()) {
        return "Instance";
--- 526,530 ----
    
    /** {@inheritDoc} */
!   public String title() {
      if (isInstance()) {
        return "Instance";

Index: ClassificationType.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/ClassificationType.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ClassificationType.java	9 Aug 2007 16:07:53 -0000	1.4
--- ClassificationType.java	17 Dec 2007 13:09:16 -0000	1.5
***************
*** 142,149 ****
    }
  
!   /**
!    * {@inheritDoc}
!    */
!   public String getGeneralName() {
      return "Classification Type";
    }
--- 142,147 ----
    }
  
!   /** {@inheritDoc} */
!   public String title() {
      return "Classification Type";
    }

Index: Transform.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Transform.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Transform.java	12 Nov 2007 07:42:51 -0000	1.5
--- Transform.java	17 Dec 2007 13:09:17 -0000	1.6
***************
*** 30,34 ****
     */
    public String toString() {
!     return getGeneralName();
    }
  
--- 30,34 ----
     */
    public String toString() {
!     return title();
    }
  

Index: Classification.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Classification.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** Classification.java	13 Dec 2007 12:00:31 -0000	1.23
--- Classification.java	17 Dec 2007 13:09:16 -0000	1.24
***************
*** 170,174 ****
  
    /** {@inheritDoc} */
!   public String getGeneralName() {
      return "Classification";
    }
--- 170,174 ----
  
    /** {@inheritDoc} */
!   public String title() {
      return "Classification";
    }

Index: Translate.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Translate.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Translate.java	12 Nov 2007 07:42:51 -0000	1.6
--- Translate.java	17 Dec 2007 13:09:17 -0000	1.7
***************
*** 130,138 ****
    }
    
!   /**
!    * Get display name
!    * @return name
!    */
!   public String getGeneralName() {
      return "Translate";
    }
--- 130,135 ----
    }
    
!   /** {@inheritDoc} */
!   public String title() {
      return "Translate";
    }

Index: ClippingPlane.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/ClippingPlane.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** ClippingPlane.java	13 Dec 2007 12:00:32 -0000	1.26
--- ClippingPlane.java	17 Dec 2007 13:09:17 -0000	1.27
***************
*** 348,352 ****
    
    /** {@inheritDoc} */
!   public String getGeneralName() {
      String s = "Clippingplane";
      return s;
--- 348,352 ----
    
    /** {@inheritDoc} */
!   public String title() {
      String s = "Clippingplane";
      return s;

Index: ParameterBlock.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/ParameterBlock.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** ParameterBlock.java	28 Oct 2007 22:45:37 -0000	1.14
--- ParameterBlock.java	17 Dec 2007 13:09:17 -0000	1.15
***************
*** 167,171 ****
     * @return String
     */
!   public String getGeneralName() {
      return "Parameters";
    }
--- 167,171 ----
     * @return String
     */
!   public String title() {
      return "Parameters";
    }

Index: Attribute.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Attribute.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** Attribute.java	18 Oct 2007 13:47:47 -0000	1.25
--- Attribute.java	17 Dec 2007 13:09:16 -0000	1.26
***************
*** 167,175 ****
    }
  
!   /**
!    * Get general name
!    * @return String
!    */
!   public String getGeneralName() {
      return "Parameter";
    }
--- 167,172 ----
    }
  
!   /** {@inheritDoc} */
!   public String title() {
      return "Parameter";
    }

Index: Relation.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Relation.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Relation.java	16 Apr 2007 15:55:22 -0000	1.8
--- Relation.java	17 Dec 2007 13:09:17 -0000	1.9
***************
*** 117,121 ****
    
    /** {@inheritDoc} */
!   public String getGeneralName() {
      return "Relation";
    }
--- 117,121 ----
    
    /** {@inheritDoc} */
!   public String title() {
      return "Relation";
    }

Index: Edge.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Edge.java,v
retrieving revision 1.105
retrieving revision 1.106
diff -C2 -d -r1.105 -r1.106
*** Edge.java	13 Dec 2007 12:00:31 -0000	1.105
--- Edge.java	17 Dec 2007 13:09:16 -0000	1.106
***************
*** 715,719 ****
  
    /** {@inheritDoc} */
!   public String getGeneralName() {
      return "Edge";
    }
--- 715,719 ----
  
    /** {@inheritDoc} */
!   public String title() {
      return "Edge";
    }

Index: Project.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v
retrieving revision 1.151
retrieving revision 1.152
diff -C2 -d -r1.151 -r1.152
*** Project.java	13 Dec 2007 12:00:30 -0000	1.151
--- Project.java	17 Dec 2007 13:09:16 -0000	1.152
***************
*** 854,858 ****
  
    /** {@inheritDoc} */
!   public String getGeneralName() {
      return "Project";
    }
--- 854,858 ----
  
    /** {@inheritDoc} */
!   public String title() {
      return "Project";
    }

Index: Camera.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Camera.java,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** Camera.java	13 Dec 2007 12:00:31 -0000	1.53
--- Camera.java	17 Dec 2007 13:09:16 -0000	1.54
***************
*** 602,610 ****
    }
  
!   /**
!    * Return the general name of Camera
!    * @return "Camera"
!    */
!   public String getGeneralName() {
      return "Camera";
    }
--- 602,607 ----
    }
  
!   /** {@inheritDoc} */
!   public String title() {
      return "Camera";
    }

Index: Line.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Line.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** Line.java	11 Dec 2007 14:49:01 -0000	1.38
--- Line.java	17 Dec 2007 13:09:15 -0000	1.39
***************
*** 135,139 ****
    
    /** {@inheritDoc} */
!   public String getGeneralName() {
      return "B-Line";
    }
--- 135,139 ----
    
    /** {@inheritDoc} */
!   public String title() {
      return "B-Line";
    }

Index: AxisRotate.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/AxisRotate.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** AxisRotate.java	12 Nov 2007 07:42:51 -0000	1.6
--- AxisRotate.java	17 Dec 2007 13:09:15 -0000	1.7
***************
*** 163,167 ****
     * @return name
     */
!   public String getGeneralName() {
      return "General Rotate";
    }
--- 163,167 ----
     * @return name
     */
!   public String title() {
      return "General Rotate";
    }

Index: Command.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Command.java,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** Command.java	13 Dec 2007 12:00:32 -0000	1.59
--- Command.java	17 Dec 2007 13:09:16 -0000	1.60
***************
*** 44,49 ****
  
    /** {@inheritDoc} */
!   public String getGeneralName() {
!     return "Command";
    }
  
--- 44,49 ----
  
    /** {@inheritDoc} */
!   public String title() {
!     return "Modellor";
    }
  
***************
*** 151,155 ****
       * {@inheritDoc}
       */
!     public String getGeneralName() {
        return "Offset Normal";
      }
--- 151,155 ----
       * {@inheritDoc}
       */
!     public String title() {
        return "Offset Normal";
      }
***************
*** 231,235 ****
       * {@inheritDoc}
       */
!     public String getGeneralName() {
        return "Smooth Surface";
      }
--- 231,235 ----
       * {@inheritDoc}
       */
!     public String title() {
        return "Smooth Surface";
      }
***************
*** 462,466 ****
      
      /** {@inheritDoc} */
!     public String getGeneralName() {
        return "Subdivide";
      }
--- 462,466 ----
      
      /** {@inheritDoc} */
!     public String title() {
        return "Subdivide";
      }
***************
*** 651,655 ****
       * {@inheritDoc}
       */
!     public String getGeneralName() {
        return "Split Edge";
      }
--- 651,655 ----
       * {@inheritDoc}
       */
!     public String title() {
        return "Split Edge";
      }
***************
*** 691,696 ****
      /** {@inheritDoc}} */
      @Override
!     public String getGeneralName() {
!       return "Create cylinder";
      }
      
--- 691,696 ----
      /** {@inheritDoc}} */
      @Override
!     public String title() {
!       return "Create Cylinder";
      }
      
***************
*** 855,859 ****
      /** {@inheritDoc}} */
      @Override
!     public String getGeneralName() {
        return "Create Pyramid";
      }
--- 855,859 ----
      /** {@inheritDoc}} */
      @Override
!     public String title() {
        return "Create Pyramid";
      }
***************
*** 890,894 ****
      }
      /** {@inheritDoc} */
!     public String getGeneralName() {
        return "Create Cube";
      }
--- 890,894 ----
      }
      /** {@inheritDoc} */
!     public String title() {
        return "Create Cube";
      }
***************
*** 958,961 ****
--- 958,968 ----
      }
      
+     /**
+      * {@inheritDoc}
+      */
+     public String title() {
+       return "Scale";
+     }
+     
      /** {@inheritDoc} */
      @Override
***************
*** 999,1002 ****
--- 1006,1017 ----
      }
      
+     /**
+      * {@inheritDoc}
+      */
+     public String title() {
+       return "Translate";
+     }
+     
+     
      /** {@inheritDoc} */
      @Override
***************
*** 1040,1043 ****
--- 1055,1065 ----
      }
      
+     /**
+      * {@inheritDoc}
+      */
+     public String title() {
+       return "Rotate";
+     }
+     
      /** {@inheritDoc} */
      @Override
***************
*** 1074,1077 ****
--- 1096,1105 ----
      }
      
+     /**
+      * {@inheritDoc}
+      */
+     public String title() {
+       return "Offset";
+     }
      
      private static List<Vertex> offset(List<Vertex> vertices, Vertex normal, double distance) {
***************
*** 1284,1287 ****
--- 1312,1322 ----
      }
      
+     /**
+      * {@inheritDoc}
+      */
+     public String title() {
+       return "Frame Net";
+     }
+     
      private List<Edge> simplify(List<Edge> edges) {
        if (edges.size() > 3) {
***************
*** 1464,1467 ****
--- 1499,1509 ----
      }
      
+     /**
+      * {@inheritDoc}
+      */
+     public String title() {
+       return "Offset";
+     }
+     
      /** {@inheritDoc} */
      @Override
***************
*** 1536,1539 ****
--- 1578,1588 ----
      }
      
+     /**
+      * {@inheritDoc}
+      */
+     public String title() {
+       return "Extrude";
+     }
+     
      private Prism connect(Surface bottom, Surface top) {
        List<Surface> sides = connect(bottom.getEdges(), top.getEdges());
***************
*** 1630,1633 ****
--- 1679,1689 ----
      }
      
+     /**
+      * {@inheritDoc}
+      */
+     public String title() {
+       return "Insert Net";
+     }
+     
      private void fill(List<Vertex> vertices, List<Edge> edges) {
        Iterator<Vertex> iter = vertices.iterator();

Index: IDTransform.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/IDTransform.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** IDTransform.java	12 Nov 2007 07:42:51 -0000	1.3
--- IDTransform.java	17 Dec 2007 13:09:16 -0000	1.4
***************
*** 43,50 ****
    }
  
!   /**
!    * @return String
!    */
!   public String getGeneralName() {
      return "ID";
    }
--- 43,48 ----
    }
  
!   /** {@inheritDoc} */
!   public String title() {
      return "ID";
    }

Index: Scale.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Scale.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Scale.java	12 Nov 2007 07:42:51 -0000	1.7
--- Scale.java	17 Dec 2007 13:09:17 -0000	1.8
***************
*** 129,137 ****
    }
    
!   /**
!    * Get display name
!    * @return name
!    */
!   public String getGeneralName() {
      return "Scale";
    }
--- 129,134 ----
    }
    
!   /** {@inheritDoc} */
!   public String title() {
      return "Scale";
    }