/[fenfire]/fenfire/org/fenfire/view/buoy/TransclusionConnector.java
ViewVC logotype

Diff of /fenfire/org/fenfire/view/buoy/TransclusionConnector.java

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.15 by tjl, Mon Jul 28 07:34:49 2003 UTC revision 1.16 by tjl, Mon Jul 28 08:22:33 2003 UTC
# Line 29  package org.fenfire.view.buoy; Line 29  package org.fenfire.view.buoy;
29  import org.nongnu.libvob.*;  import org.nongnu.libvob.*;
30  import org.nongnu.libvob.buoy.*;  import org.nongnu.libvob.buoy.*;
31  import org.nongnu.libvob.impl.DefaultVobMatcher;  import org.nongnu.libvob.impl.DefaultVobMatcher;
 import org.nongnu.libvob.lava.placeable.Placeable;  
32  import org.nongnu.alph.*;  import org.nongnu.alph.*;
33  import org.fenfire.*;  import org.fenfire.*;
34  import org.fenfire.swamp.*;  import org.fenfire.swamp.*;
# Line 45  import java.util.List; Line 44  import java.util.List;
44  /** Hang transclusion buoys.  /** Hang transclusion buoys.
45   */   */
46  public class TransclusionConnector implements BuoyViewConnector {  public class TransclusionConnector implements BuoyViewConnector {
 <<<<<<< TransclusionConnector.java  
47  public static final String rcsid = "$Id$";  public static final String rcsid = "$Id$";
 =======  
 public static final String rcsid = "$Id$";  
 >>>>>>> 1.14  
48      public static boolean dbg = false;      public static boolean dbg = false;
49      private static void pa(String s) { System.out.println("TransclusionConnector:: "+s); }      private static void pa(String s) { System.out.println("TransclusionConnector:: "+s); }
50    
# Line 170  public static final String rcsid = "$Id$ Line 165  public static final String rcsid = "$Id$
165          if (node == null) throw new Error("Impossible!");          if (node == null) throw new Error("Impossible!");
166          float x = RDFUtil.getFloat(fen.graph, node, CANVAS2D.x);          float x = RDFUtil.getFloat(fen.graph, node, CANVAS2D.x);
167          float y = RDFUtil.getFloat(fen.graph, node, CANVAS2D.y);          float y = RDFUtil.getFloat(fen.graph, node, CANVAS2D.y);
168          Placeable p = (Placeable)nodeView.f(fen.constgraph, node);          org.nongnu.libvob.lava.placeable.Placeable p =
169                    (org.nongnu.libvob.lava.placeable.Placeable)nodeView.f(fen.constgraph, node);
170          float w = p.getWidth();          float w = p.getWidth();
171          float h = p.getHeight();          float h = p.getHeight();
172          int bw = (int)(mx * w);          int bw = (int)(mx * w);

Legend:
Removed from v.1.15  
changed lines
  Added in v.1.16

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26