more uniform graphview terminology;
authorwenzelm
Wed Sep 26 15:01:45 2012 +0200 (2012-09-26)
changeset 495757529c77ee92e
parent 49574 f27cb2662eda
child 49597 11bcea724b2c
more uniform graphview terminology;
src/Tools/Graphview/lib/Tools/graphview
src/Tools/Graphview/src/frame.scala
src/Tools/Graphview/src/graphview.scala
     1.1 --- a/src/Tools/Graphview/lib/Tools/graphview	Wed Sep 26 14:56:59 2012 +0200
     1.2 +++ b/src/Tools/Graphview/lib/Tools/graphview	Wed Sep 26 15:01:45 2012 +0200
     1.3 @@ -9,8 +9,8 @@
     1.4  
     1.5  declare -a SOURCES=(
     1.6    "src/floating_dialog.scala"
     1.7 -  "src/frame.scala"
     1.8    "src/graph_panel.scala"
     1.9 +  "src/graphview.scala"
    1.10    "src/layout_pendulum.scala"
    1.11    "src/main_panel.scala"
    1.12    "src/model.scala"
    1.13 @@ -166,7 +166,7 @@
    1.14      cp -f "$GRAPH_FILE" "$PRIVATE_FILE" || fail "Cannot copy file: $GRAPH_FILE"
    1.15    fi
    1.16  
    1.17 -  "$ISABELLE_TOOL" java $GRAPHVIEW_JAVA_OPTIONS isabelle.graphview.Frame "$PRIVATE_FILE"
    1.18 +  "$ISABELLE_TOOL" java $GRAPHVIEW_JAVA_OPTIONS isabelle.graphview.Graphview "$PRIVATE_FILE"
    1.19    RC="$?"
    1.20  
    1.21    rm -f "$PRIVATE_FILE"
     2.1 --- a/src/Tools/Graphview/src/frame.scala	Wed Sep 26 14:56:59 2012 +0200
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,51 +0,0 @@
     2.4 -/*  Title:      Tools/Graphview/src/frame.scala
     2.5 -    Author:     Markus Kaiser, TU Muenchen
     2.6 -
     2.7 -Graphview standalone frame.
     2.8 -*/
     2.9 -
    2.10 -package isabelle.graphview
    2.11 -
    2.12 -
    2.13 -import isabelle._
    2.14 -
    2.15 -import java.awt.Dimension
    2.16 -import scala.swing.{MainFrame, BorderPanel, Window, SwingApplication}
    2.17 -import javax.swing.border.EmptyBorder
    2.18 -
    2.19 -
    2.20 -object Frame extends SwingApplication
    2.21 -{
    2.22 -  def startup(args : Array[String])
    2.23 -  {
    2.24 -    // FIXME avoid I/O etc. on Swing thread
    2.25 -    val graph: Model.Graph =
    2.26 -      try {
    2.27 -        Platform.init_laf()
    2.28 -        Isabelle_System.init()
    2.29 -        Isabelle_System.install_fonts()
    2.30 -
    2.31 -        args.toList match {
    2.32 -          case List(arg) =>
    2.33 -            Model.decode_graph(YXML.parse_body(Symbol.decode(File.read(Path.explode(arg)))))
    2.34 -          case _ => error("Bad arguments:\n" + cat_lines(args))
    2.35 -        }
    2.36 -      }
    2.37 -      catch { case exn: Throwable => println(Exn.message(exn)); sys.exit(1) }
    2.38 -
    2.39 -    val top = new MainFrame {
    2.40 -      title = "Graphview"
    2.41 -      minimumSize = new Dimension(640, 480)
    2.42 -      preferredSize = new Dimension(800, 600)
    2.43 -
    2.44 -      contents = new BorderPanel {
    2.45 -        border = new EmptyBorder(5, 5, 5, 5)
    2.46 -
    2.47 -        add(new Main_Panel(graph), BorderPanel.Position.Center)
    2.48 -      }
    2.49 -    }
    2.50 -
    2.51 -    top.pack()
    2.52 -    top.visible = true
    2.53 -  }
    2.54 -}
    2.55 \ No newline at end of file
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/src/Tools/Graphview/src/graphview.scala	Wed Sep 26 15:01:45 2012 +0200
     3.3 @@ -0,0 +1,51 @@
     3.4 +/*  Title:      Tools/Graphview/src/graphview.scala
     3.5 +    Author:     Markus Kaiser, TU Muenchen
     3.6 +
     3.7 +Graphview standalone application.
     3.8 +*/
     3.9 +
    3.10 +package isabelle.graphview
    3.11 +
    3.12 +
    3.13 +import isabelle._
    3.14 +
    3.15 +import java.awt.Dimension
    3.16 +import scala.swing.{MainFrame, BorderPanel, Window, SwingApplication}
    3.17 +import javax.swing.border.EmptyBorder
    3.18 +
    3.19 +
    3.20 +object Graphview extends SwingApplication
    3.21 +{
    3.22 +  def startup(args : Array[String])
    3.23 +  {
    3.24 +    // FIXME avoid I/O etc. on Swing thread
    3.25 +    val graph: Model.Graph =
    3.26 +      try {
    3.27 +        Platform.init_laf()
    3.28 +        Isabelle_System.init()
    3.29 +        Isabelle_System.install_fonts()
    3.30 +
    3.31 +        args.toList match {
    3.32 +          case List(arg) =>
    3.33 +            Model.decode_graph(YXML.parse_body(Symbol.decode(File.read(Path.explode(arg)))))
    3.34 +          case _ => error("Bad arguments:\n" + cat_lines(args))
    3.35 +        }
    3.36 +      }
    3.37 +      catch { case exn: Throwable => println(Exn.message(exn)); sys.exit(1) }
    3.38 +
    3.39 +    val top = new MainFrame {
    3.40 +      title = "Graphview"
    3.41 +      minimumSize = new Dimension(640, 480)
    3.42 +      preferredSize = new Dimension(800, 600)
    3.43 +
    3.44 +      contents = new BorderPanel {
    3.45 +        border = new EmptyBorder(5, 5, 5, 5)
    3.46 +
    3.47 +        add(new Main_Panel(graph), BorderPanel.Position.Center)
    3.48 +      }
    3.49 +    }
    3.50 +
    3.51 +    top.pack()
    3.52 +    top.visible = true
    3.53 +  }
    3.54 +}
    3.55 \ No newline at end of file