[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] fenfire/org/fenfire/view AreaSelectingView2D.ja...
|
From: |
Tuomas J. Lukka |
|
Subject: |
[Gzz-commits] fenfire/org/fenfire/view AreaSelectingView2D.ja... |
|
Date: |
Mon, 28 Jul 2003 04:22:33 -0400 |
CVSROOT: /cvsroot/fenfire
Module name: fenfire
Branch:
Changes by: Tuomas J. Lukka <address@hidden> 03/07/28 04:22:33
Modified files:
org/fenfire/view: AreaSelectingView2D.java CanvasView2D.java
TextNodeView.java
org/fenfire/view/buoy: AbstractMainNode2D.java PPConnector.java
TransclusionConnector.java
Log message:
Don't import from lava
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/AreaSelectingView2D.java.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/CanvasView2D.java.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/TextNodeView.java.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java.diff?tr1=1.34&tr2=1.35&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/PPConnector.java.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/TransclusionConnector.java.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
Patches:
Index: fenfire/org/fenfire/view/AreaSelectingView2D.java
diff -u fenfire/org/fenfire/view/AreaSelectingView2D.java:1.10
fenfire/org/fenfire/view/AreaSelectingView2D.java:1.11
--- fenfire/org/fenfire/view/AreaSelectingView2D.java:1.10 Sat Jul 19
05:04:36 2003
+++ fenfire/org/fenfire/view/AreaSelectingView2D.java Mon Jul 28 04:22:32 2003
@@ -1,16 +1,15 @@
// (c): Matti J. Katila
package org.fenfire.view;
-import org.fenfire.view.lava.*;
import org.nongnu.libvob.*;
import org.nongnu.libvob.gl.*;
-import org.fenfire.util.lava.*;
import java.util.*;
/** View2D to draw the selecting area
*/
-public class AreaSelectingView2D extends View2D implements FastView {
+public class AreaSelectingView2D extends View2D
+ implements org.fenfire.view.lava.FastView {
public static boolean dbg = false;
private static void p(String s) {
System.out.println("AreaSelectingView2D:: "+s); }
@@ -41,7 +40,8 @@
}
- private CoordsysCache coords = new CoordsysCache();
+ private org.fenfire.util.lava.CoordsysCache coords =
+ new org.fenfire.util.lava.CoordsysCache();
public void render(VobScene vs, Object plane,
int matchingParent,
Index: fenfire/org/fenfire/view/CanvasView2D.java
diff -u fenfire/org/fenfire/view/CanvasView2D.java:1.20
fenfire/org/fenfire/view/CanvasView2D.java:1.21
--- fenfire/org/fenfire/view/CanvasView2D.java:1.20 Thu Jul 17 12:28:19 2003
+++ fenfire/org/fenfire/view/CanvasView2D.java Mon Jul 28 04:22:32 2003
@@ -29,25 +29,22 @@
import org.fenfire.*;
import org.fenfire.view.*;
import org.fenfire.view.buoy.*;
-import org.fenfire.view.lava.FastView;
import org.fenfire.vocab.*;
import org.fenfire.swamp.*;
import org.fenfire.util.*;
-import org.fenfire.util.lava.*;
import org.nongnu.libvob.*;
import org.nongnu.libvob.gl.*;
import org.nongnu.libvob.impl.gl.*;
import org.nongnu.libvob.buoy.*;
import org.nongnu.libvob.vobs.SimpleConnection;
-import org.nongnu.libvob.lava.placeable.Placeable;
import org.nongnu.alph.*;
import java.util.*;
/** A View2D of a CANVAS2D, with a given node function.
*/
-public class CanvasView2D extends View2D implements NodedView2D, FastView {
-public static final String rcsid = "$Id: CanvasView2D.java,v 1.20 2003/07/17
16:28:19 mudyc Exp $";
+public class CanvasView2D extends View2D implements NodedView2D,
org.fenfire.view.lava.FastView {
+public static final String rcsid = "$Id: CanvasView2D.java,v 1.21 2003/07/28
08:22:32 tjl Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.out.println("CanvasView2D::"+s);
}
@@ -72,7 +69,8 @@
//private Object container;
private int paper2screen = -1;
- private CoordsysCache coords = new CoordsysCache();
+ private org.fenfire.util.lava.CoordsysCache coords =
+ new org.fenfire.util.lava.CoordsysCache();
private Map containers = new HashMap(10);
public void render(VobScene vs, Object container,
@@ -94,7 +92,8 @@
//nodes.clear();
while (iter.hasNext()) {
Object n = iter.next();
- Placeable p = (Placeable)nodeView.f(fen.constgraph, n);
+ org.nongnu.libvob.lava.placeable.Placeable p =
+
(org.nongnu.libvob.lava.placeable.Placeable)nodeView.f(fen.constgraph, n);
Pair matchKey = new Pair(container, n);
int cs = vs.coords.orthoBox(paper2screen, 0,1,2,3,4,5,6);
@@ -143,7 +142,9 @@
float x = RDFUtil.getFloat(fen.graph, n, CANVAS2D.x);
float y = RDFUtil.getFloat(fen.graph, n, CANVAS2D.y);
- Placeable p = (Placeable)nodeView.f(fen.constgraph, n);
+ org.nongnu.libvob.lava.placeable.Placeable p =
+ (org.nongnu.libvob.lava.placeable.Placeable)nodeView
+ .f(fen.constgraph, n);
// int cs = vs.coords.translate(paper2screen, x, y);
if(dbg) pa("CANVAS: "+p.getWidth()+" "+p.getHeight());
Index: fenfire/org/fenfire/view/TextNodeView.java
diff -u fenfire/org/fenfire/view/TextNodeView.java:1.9
fenfire/org/fenfire/view/TextNodeView.java:1.10
--- fenfire/org/fenfire/view/TextNodeView.java:1.9 Tue Jul 1 12:33:33 2003
+++ fenfire/org/fenfire/view/TextNodeView.java Mon Jul 28 04:22:32 2003
@@ -26,7 +26,6 @@
* Written by Benja Fallenstein
*/
package org.fenfire.view;
-import org.fenfire.view.lava.*;
import org.fenfire.swamp.*;
import org.nongnu.alph.*;
import org.nongnu.libvob.*;
@@ -38,8 +37,9 @@
* <em>Should</em> take a width and do linebreaking;
* currently, places text as a single very long line.
*/
-public class TextNodeView extends TextHandler implements NodeFunction {
-public static final String rcsid = "$Id: TextNodeView.java,v 1.9 2003/07/01
16:33:33 mudyc Exp $";
+public class TextNodeView extends org.fenfire.view.lava.TextHandler
+ implements NodeFunction {
+public static final String rcsid = "$Id: TextNodeView.java,v 1.10 2003/07/28
08:22:32 tjl Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.out.println("TextNodeView::"+s);
}
@@ -60,8 +60,9 @@
private boolean hasContext = true;
public void setHasNoContext() { hasContext = false; }
- private FenPDFContext context = null;
- public void setContext(FenPDFContext context) { this.context = context; }
+ private org.fenfire.view.lava.FenPDFContext context = null;
+ public void setContext(org.fenfire.view.lava.FenPDFContext context)
+ { this.context = context; }
public Object f(ConstGraph g, Object node) {
if (hasContext) {
Index: fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java
diff -u fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java:1.34
fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java:1.35
--- fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java:1.34 Sat Jul 19
08:55:10 2003
+++ fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java Mon Jul 28
04:22:32 2003
@@ -26,7 +26,6 @@
package org.fenfire.view.buoy;
import org.fenfire.view.*;
-import org.fenfire.view.lava.*;
import org.fenfire.util.ControlBinding;
import org.nongnu.libvob.*;
@@ -39,7 +38,8 @@
* a View2D. This class implements the keyboard and mouse
* command for moving on the spatial plane.
*/
-public abstract class AbstractMainNode2D implements BuoyViewMainNode, FastView
{
+public abstract class AbstractMainNode2D implements BuoyViewMainNode,
+ org.fenfire.view.lava.FastView {
public static boolean dbg = false;
private static void p(String s) { System.out.println("AbstractMainNode2D::
"+s); }
@@ -275,13 +275,14 @@
if (dbg) p("key: "+realKey);
View2D view = getView2D();
while (view != null) {
- if (view instanceof FastView)
+ if (view instanceof org.fenfire.view.lava.FastView)
/** Jams the machine if called.
* ''Single Multiple'' views makes things awful.
*
* ...working on a better solution.
*/
- ((FastView)view).chgFast(oldVobScene, realKey);
+ ((org.fenfire.view.lava.FastView)view)
+ .chgFast(oldVobScene, realKey);
view = view.getChildView2D();
}
}
Index: fenfire/org/fenfire/view/buoy/PPConnector.java
diff -u fenfire/org/fenfire/view/buoy/PPConnector.java:1.16
fenfire/org/fenfire/view/buoy/PPConnector.java:1.17
--- fenfire/org/fenfire/view/buoy/PPConnector.java:1.16 Thu Jul 17 12:28:19 2003
+++ fenfire/org/fenfire/view/buoy/PPConnector.java Mon Jul 28 04:22:33 2003
@@ -34,14 +34,13 @@
import org.nongnu.libvob.*;
import org.nongnu.libvob.buoy.*;
import org.nongnu.libvob.impl.DefaultVobMatcher;
-import org.nongnu.libvob.lava.placeable.Placeable;
import java.util.Iterator;
/** Make the kinds of links familiar from PP structure.
*/
public class PPConnector implements BuoyViewConnector {
-public static final String rcsid = "$Id: PPConnector.java,v 1.16 2003/07/17
16:28:19 mudyc Exp $";
+public static final String rcsid = "$Id: PPConnector.java,v 1.17 2003/07/28
08:22:33 tjl Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.out.println("PPConnector::"+s); }
@@ -121,7 +120,8 @@
if (node == null) throw new Error("Impossible!");
float x = RDFUtil.getFloat(fen.graph, node, CANVAS2D.x);
float y = RDFUtil.getFloat(fen.graph, node, CANVAS2D.y);
- Placeable p = (Placeable)nodeView.f(fen.constgraph, node);
+ org.nongnu.libvob.lava.placeable.Placeable p =
+
(org.nongnu.libvob.lava.placeable.Placeable)nodeView.f(fen.constgraph, node);
return new java.awt.Rectangle((int)(x-dx), (int)(y-dy),
(int)p.getWidth()+dx+dx,
(int)p.getHeight()+dy+dy);
Index: fenfire/org/fenfire/view/buoy/TransclusionConnector.java
diff -u fenfire/org/fenfire/view/buoy/TransclusionConnector.java:1.15
fenfire/org/fenfire/view/buoy/TransclusionConnector.java:1.16
--- fenfire/org/fenfire/view/buoy/TransclusionConnector.java:1.15 Mon Jul
28 03:34:49 2003
+++ fenfire/org/fenfire/view/buoy/TransclusionConnector.java Mon Jul 28
04:22:33 2003
@@ -29,7 +29,6 @@
import org.nongnu.libvob.*;
import org.nongnu.libvob.buoy.*;
import org.nongnu.libvob.impl.DefaultVobMatcher;
-import org.nongnu.libvob.lava.placeable.Placeable;
import org.nongnu.alph.*;
import org.fenfire.*;
import org.fenfire.swamp.*;
@@ -45,11 +44,7 @@
/** Hang transclusion buoys.
*/
public class TransclusionConnector implements BuoyViewConnector {
-<<<<<<< TransclusionConnector.java
-public static final String rcsid = "$Id: TransclusionConnector.java,v 1.15
2003/07/28 07:34:49 tjl Exp $";
-=======
-public static final String rcsid = "$Id: TransclusionConnector.java,v 1.15
2003/07/28 07:34:49 tjl Exp $";
->>>>>>> 1.14
+public static final String rcsid = "$Id: TransclusionConnector.java,v 1.16
2003/07/28 08:22:33 tjl Exp $";
public static boolean dbg = false;
private static void pa(String s) {
System.out.println("TransclusionConnector:: "+s); }
@@ -170,7 +165,8 @@
if (node == null) throw new Error("Impossible!");
float x = RDFUtil.getFloat(fen.graph, node, CANVAS2D.x);
float y = RDFUtil.getFloat(fen.graph, node, CANVAS2D.y);
- Placeable p = (Placeable)nodeView.f(fen.constgraph, node);
+ org.nongnu.libvob.lava.placeable.Placeable p =
+
(org.nongnu.libvob.lava.placeable.Placeable)nodeView.f(fen.constgraph, node);
float w = p.getWidth();
float h = p.getHeight();
int bw = (int)(mx * w);