Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4745/src/net/sourceforge/bprocessor/gl/view
Modified Files:
AbstractView.java
Log Message:
All access to database now through the Project instance
Index: AbstractView.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/AbstractView.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** AbstractView.java 30 Sep 2005 17:56:16 -0000 1.39
--- AbstractView.java 2 Oct 2005 14:48:22 -0000 1.40
***************
*** 11,23 ****
import net.sourceforge.bprocessor.model.CoordinateSystem;
import net.sourceforge.bprocessor.model.Plane;
import net.sourceforge.bprocessor.model.Edge;
! import net.sourceforge.bprocessor.model.EdgeFacade;
import net.sourceforge.bprocessor.model.Domain;
import net.sourceforge.bprocessor.model.Vertex;
- import net.sourceforge.bprocessor.model.VertexFacade;
import net.sourceforge.bprocessor.model.Surface;
- import net.sourceforge.bprocessor.model.SurfaceFacade;
- import net.sourceforge.bprocessor.model.FunctionalSpace;
import java.util.ArrayList;
--- 11,21 ----
import net.sourceforge.bprocessor.model.CoordinateSystem;
+ import net.sourceforge.bprocessor.model.FunctionalSpace;
import net.sourceforge.bprocessor.model.Plane;
import net.sourceforge.bprocessor.model.Edge;
! import net.sourceforge.bprocessor.model.Project;
import net.sourceforge.bprocessor.model.Domain;
import net.sourceforge.bprocessor.model.Vertex;
import net.sourceforge.bprocessor.model.Surface;
import java.util.ArrayList;
***************
*** 521,527 ****
protected void drawAll(GLDrawable gld) {
! Set surfaces = SurfaceFacade.getInstance().findAll();
! Set edges = EdgeFacade.getInstance().findAll();
! Set vertices = VertexFacade.getInstance().findAll();
Collection selection = glv.getTool().getSelection();
--- 519,525 ----
protected void drawAll(GLDrawable gld) {
! Set surfaces = Project.getInstance().getSurfaces();
! Set edges = Project.getInstance().getEdges();
! Set vertices = Project.getInstance().getVertices();
Collection selection = glv.getTool().getSelection();
***************
*** 547,551 ****
gl.glColor3fv(SELECTED_COLOR);
if (o instanceof Vertex) {
! Vertex v = VertexFacade.getInstance().findById(((Vertex)o).getId());
gl.glPointSize(5.0f);
gl.glBegin(GL.GL_POINTS);
--- 545,549 ----
gl.glColor3fv(SELECTED_COLOR);
if (o instanceof Vertex) {
! Vertex v = (Vertex) o;
gl.glPointSize(5.0f);
gl.glBegin(GL.GL_POINTS);
***************
*** 554,558 ****
gl.glPointSize(1.0f);
} else if (o instanceof Edge) {
! Edge e = EdgeFacade.getInstance().findById(((Edge)o).getId());
Vertex to = e.getTo();
Vertex from = e.getFrom();
--- 552,556 ----
gl.glPointSize(1.0f);
} else if (o instanceof Edge) {
! Edge e = (Edge) o;
Vertex to = e.getTo();
Vertex from = e.getFrom();
***************
*** 564,568 ****
gl.glEnable(GL.GL_POLYGON_STIPPLE);
gl.glPolygonStipple(transparency);
! Surface s = SurfaceFacade.getInstance().findById(((Surface)o).getId());
drawSurface(s);
gl.glDisable(GL.GL_POLYGON_STIPPLE);
--- 562,566 ----
gl.glEnable(GL.GL_POLYGON_STIPPLE);
gl.glPolygonStipple(transparency);
! Surface s = (Surface) o;
drawSurface(s);
gl.glDisable(GL.GL_POLYGON_STIPPLE);
***************
*** 792,796 ****
*/
private void drawEdges(GLDrawable gld) {
! Set edges = EdgeFacade.getInstance().findAll();
GL gl = gld.getGL();
GLU glu = gld.getGLU();
--- 790,794 ----
*/
private void drawEdges(GLDrawable gld) {
! Set edges = Project.getInstance().getEdges();
GL gl = gld.getGL();
GLU glu = gld.getGLU();
***************
*** 809,813 ****
*/
private void drawSurfaces(GLDrawable gld) {
! Set surfaces = SurfaceFacade.getInstance().findAll();
GL gl = gld.getGL();
GLU glu = gld.getGLU();
--- 807,811 ----
*/
private void drawSurfaces(GLDrawable gld) {
! Set surfaces = Project.getInstance().getSurfaces();
GL gl = gld.getGL();
GLU glu = gld.getGLU();
|
