[Libreoffice-commits] .: accessibility/workben

Caolán McNamara caolan at kemper.freedesktop.org
Mon Dec 19 09:10:59 PST 2011


 accessibility/workben/TODO                                                                 |   13 
 accessibility/workben/makefile                                                             |    9 
 accessibility/workben/makefile.in                                                          |   31 
 accessibility/workben/makefile.mk                                                          |   39 
 accessibility/workben/org/openoffice/accessibility/Makefile                                |    6 
 accessibility/workben/org/openoffice/accessibility/awb/AccessibilityWorkBench.java         |  702 ----------
 accessibility/workben/org/openoffice/accessibility/awb/HelpWindow.java                     |  187 --
 accessibility/workben/org/openoffice/accessibility/awb/Makefile                            |   11 
 accessibility/workben/org/openoffice/accessibility/awb/canvas/Canvas.java                  |  322 ----
 accessibility/workben/org/openoffice/accessibility/awb/canvas/CanvasShape.java             |  412 -----
 accessibility/workben/org/openoffice/accessibility/awb/canvas/Makefile                     |   13 
 accessibility/workben/org/openoffice/accessibility/awb/canvas/MouseObserver.java           |  104 -
 accessibility/workben/org/openoffice/accessibility/awb/canvas/ShapeContainer.java          |  237 ---
 accessibility/workben/org/openoffice/accessibility/awb/canvas/makefile.common              |   34 
 accessibility/workben/org/openoffice/accessibility/awb/canvas/makefile.mk                  |   47 
 accessibility/workben/org/openoffice/accessibility/awb/makefile.common                     |   30 
 accessibility/workben/org/openoffice/accessibility/awb/makefile.mk                         |   57 
 accessibility/workben/org/openoffice/accessibility/awb/manifest                            |    3 
 accessibility/workben/org/openoffice/accessibility/awb/tree/AccessibilityModel.java        |  154 --
 accessibility/workben/org/openoffice/accessibility/awb/tree/AccessibilityNode.java         |  163 --
 accessibility/workben/org/openoffice/accessibility/awb/tree/AccessibilityTree.java         |   89 -
 accessibility/workben/org/openoffice/accessibility/awb/tree/AccessibilityTreeModel.java    |  217 ---
 accessibility/workben/org/openoffice/accessibility/awb/tree/DynamicAccessibilityModel.java |  123 -
 accessibility/workben/org/openoffice/accessibility/awb/tree/DynamicAccessibilityNode.java  |   92 -
 accessibility/workben/org/openoffice/accessibility/awb/tree/Makefile                       |   40 
 accessibility/workben/org/openoffice/accessibility/awb/tree/ToolkitNode.java               |  215 ---
 accessibility/workben/org/openoffice/accessibility/awb/tree/makefile.common                |   35 
 accessibility/workben/org/openoffice/accessibility/awb/tree/makefile.mk                    |   51 
 accessibility/workben/org/openoffice/accessibility/awb/view/ComponentView.java             |  195 --
 accessibility/workben/org/openoffice/accessibility/awb/view/ContextView.java               |  115 -
 accessibility/workben/org/openoffice/accessibility/awb/view/EditableTextView.java          |  119 -
 accessibility/workben/org/openoffice/accessibility/awb/view/EventMonitorView.java          |  126 -
 accessibility/workben/org/openoffice/accessibility/awb/view/FocusView.java                 |  148 --
 accessibility/workben/org/openoffice/accessibility/awb/view/LayoutManager.java             |  160 --
 accessibility/workben/org/openoffice/accessibility/awb/view/Makefile                       |   11 
 accessibility/workben/org/openoffice/accessibility/awb/view/ObjectView.java                |   90 -
 accessibility/workben/org/openoffice/accessibility/awb/view/ObjectViewContainer.java       |  310 ----
 accessibility/workben/org/openoffice/accessibility/awb/view/ObjectViewContainerWindow.java |   35 
 accessibility/workben/org/openoffice/accessibility/awb/view/ParentView.java                |  147 --
 accessibility/workben/org/openoffice/accessibility/awb/view/SelectionView.java             |  267 ---
 accessibility/workben/org/openoffice/accessibility/awb/view/ServiceInterfaceView.java      |  150 --
 accessibility/workben/org/openoffice/accessibility/awb/view/StateSetView.java              |  199 --
 accessibility/workben/org/openoffice/accessibility/awb/view/TableView.java                 |  161 --
 accessibility/workben/org/openoffice/accessibility/awb/view/TextView.java                  |  467 ------
 accessibility/workben/org/openoffice/accessibility/awb/view/ViewGridLayout.java            |  117 -
 accessibility/workben/org/openoffice/accessibility/awb/view/makefile.common                |   45 
 accessibility/workben/org/openoffice/accessibility/awb/view/makefile.mk                    |   51 
 accessibility/workben/org/openoffice/accessibility/awb/view/text/CaretSpinnerModel.java    |  122 -
 accessibility/workben/org/openoffice/accessibility/awb/view/text/Makefile                  |   11 
 accessibility/workben/org/openoffice/accessibility/awb/view/text/TextActionDialog.java     |  208 --
 accessibility/workben/org/openoffice/accessibility/awb/view/text/TextAttributeDialog.java  |  179 --
 accessibility/workben/org/openoffice/accessibility/awb/view/text/TextDialogFactory.java    |  136 -
 accessibility/workben/org/openoffice/accessibility/awb/view/text/TextEditDialog.java       |  122 -
 accessibility/workben/org/openoffice/accessibility/awb/view/text/makefile.common           |   34 
 accessibility/workben/org/openoffice/accessibility/awb/view/text/makefile.mk               |   51 
 accessibility/workben/org/openoffice/accessibility/misc/AccessibleEventMulticaster.java    |   92 -
 accessibility/workben/org/openoffice/accessibility/misc/Connector.java                     |   50 
 accessibility/workben/org/openoffice/accessibility/misc/InformationWriter.java             |  421 -----
 accessibility/workben/org/openoffice/accessibility/misc/Makefile                           |   38 
 accessibility/workben/org/openoffice/accessibility/misc/MessageArea.java                   |  125 -
 accessibility/workben/org/openoffice/accessibility/misc/NameProvider.java                  |  263 ---
 accessibility/workben/org/openoffice/accessibility/misc/OfficeConnection.java              |  169 --
 accessibility/workben/org/openoffice/accessibility/misc/Options.java                       |  106 -
 accessibility/workben/org/openoffice/accessibility/misc/SimpleOffice.java                  |  413 -----
 accessibility/workben/org/openoffice/accessibility/misc/makefile.common                    |   36 
 accessibility/workben/org/openoffice/accessibility/misc/makefile.mk                        |   46 
 66 files changed, 8971 deletions(-)

New commits:
commit c8e7f883257d45af0996616dcc33d7feff27a077
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Dec 19 16:02:01 2011 +0000

    drop this workben

diff --git a/accessibility/workben/TODO b/accessibility/workben/TODO
deleted file mode 100644
index 6fdfd5c..0000000
--- a/accessibility/workben/TODO
+++ /dev/null
@@ -1,13 +0,0 @@
-This is a unsorted list of TODO's and idea regarding the Accessibility Workbench
-
-* increase repaint performance
-* fix paint problems in ObjectViewContainer for e.g. File menu
-* change package structure to be flat (apps don't need deep package names)
-* add ant build script(s)
-* evaluate TreeTable as enhanced overview
-* add error panel and a bunch of consistency checks
-* add focus tracking mode
-* evaluate drawing transparent frames at screen coordinates of an object
-* enhance text view (colors)
-* add table view
-* more generic view loading (Class.forName())
diff --git a/accessibility/workben/makefile b/accessibility/workben/makefile
deleted file mode 100644
index 4bd7c05..0000000
--- a/accessibility/workben/makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-all:
-	cd source/org/openoffice/accessibility ; $(MAKE) all
-
-ROOT=source
-SUBDIRS=source/org/openoffice/accessibility
-include source/makefile.in
-
-run: all
-	$(JAVA) -classpath $(CLASSPATH) org.openoffice.accessibility.awb.AccessibilityWorkBench
diff --git a/accessibility/workben/makefile.in b/accessibility/workben/makefile.in
deleted file mode 100644
index d81df5f..0000000
--- a/accessibility/workben/makefile.in
+++ /dev/null
@@ -1,31 +0,0 @@
-PRJ=$(ROOT)/..
-SETTINGS=$(OO_SDK_HOME)/settings
-include $(SETTINGS)/settings.mk
-include $(SETTINGS)/std.mk
-include $(SETTINGS)/dk.mk
-
-OUT_COMP_JAVA = $(OUT_CLASS)/$(patsubst .,/,$(PACKAGE))
-JAVAC=$(JAVA_HOME)/bin/javac
-JAVA=$(JAVA_HOME)/bin/java
-CLASS_FILES = $(patsubst %.java, %.class, $(JAVAFILES))
-CLASSPATH = $(subst $(EMPTYSTRING) $(PATH_SEPARATOR),$(PATH_SEPARATOR),$(OFFICE_CLASSES_DIR)/jurt.jar\
-		$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)/unoil.jar\
-		$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)/ridl.jar\
-		$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)/juh.jar\
-		$(PATH_SEPARATOR)$(OUT_COMP_JAVA)\
-		$(PATH_SEPARATOR).\
-		$(PATH_SEPARATOR)$(ROOT)\
-		)
-
-subdirs:
-	$(foreach dir,$(SUBDIRS), cd $(dir);$(MAKE);cd ..;)
-
-clean:
-	-rm *.class *.jar
-	$(foreach dir,$(SUBDIRS), cd $(dir);$(MAKE) clean ; cd ..;)
-
-
-%.class : %.java
-	$(JAVAC) -classpath $(CLASSPATH) $<
-
-.PHONY: all package clean subdirs
diff --git a/accessibility/workben/makefile.mk b/accessibility/workben/makefile.mk
deleted file mode 100644
index 7f19d89..0000000
--- a/accessibility/workben/makefile.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-# copied from settings.mk
-SOLARBINDIR=$(SOLARVERSION)$/$(INPATH)$/bin$(UPDMINOREXT)
-
-# Please modify the following lines to match your environment:
-#   If you use the run: target at the end of the file, then adapt pipe name
-PIPE_NAME = $(USER)
-
-# The following variables probably don't need to be changed.
-JAVA = java
-#   The JAR_PATH points to the jar files of your local office installation.
-JAR_PATH = $(SOLARBINDIR)$/
-
-
-# The rest of this makefile should not need to be touched.
-
-JAR_FILES =		\
-    unoil.jar	\
-    ridl.jar	\
-    jurt.jar	\
-    juh.jar		\
-    java_uno.jar
-
-
-JAVA_CLASSPATHS := 			\
-    ..$/$(INPATH)$/class						\
-    $(foreach,i,$(JAR_FILES) $(JAR_PATH)$i) \
-    $(CLASSPATH)
-
-CLASSPATH !:=$(JAVA_CLASSPATHS:t$(PATH_SEPERATOR))
-
-all:
-    build
-
-# Example of how to run the work bench.
-run:
-    +$(JAVA) -classpath "$(CLASSPATH)" org/openoffice/accessibility/awb/AccessibilityWorkBench -p $(PIPE_NAME)
-
-runjar:
-    +$(JAVA) -classpath "$(CLASSPATH)" -jar AccessibilityWorkBench.jar -p $(PIPE_NAME)
diff --git a/accessibility/workben/org/openoffice/accessibility/Makefile b/accessibility/workben/org/openoffice/accessibility/Makefile
deleted file mode 100644
index a6db6a0..0000000
--- a/accessibility/workben/org/openoffice/accessibility/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-all : subdirs
-
-ROOT=../../../
-SUBDIRS=misc awb
-include $(ROOT)/makefile.in
-
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/AccessibilityWorkBench.java b/accessibility/workben/org/openoffice/accessibility/awb/AccessibilityWorkBench.java
deleted file mode 100644
index 6e8e45b..0000000
--- a/accessibility/workben/org/openoffice/accessibility/awb/AccessibilityWorkBench.java
+++ /dev/null
@@ -1,702 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-package org.openoffice.accessibility.awb;
-
-import java.awt.Cursor;
-import java.awt.GridBagConstraints;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import javax.swing.ButtonGroup;
-import javax.swing.JButton;
-import javax.swing.JCheckBoxMenuItem;
-import javax.swing.JComponent;
-import javax.swing.JFrame;
-import javax.swing.JMenu;
-import javax.swing.JMenuBar;
-import javax.swing.JMenuItem;
-import javax.swing.JPanel;
-import javax.swing.JRadioButtonMenuItem;
-import javax.swing.JScrollPane;
-import javax.swing.JSplitPane;
-import javax.swing.event.TreeSelectionListener;
-import javax.swing.event.TreeSelectionEvent;
-import javax.swing.event.TreeExpansionListener;
-import javax.swing.event.TreeWillExpandListener;
-import javax.swing.tree.TreeNode;
-import javax.swing.tree.TreePath;
-
-import com.sun.star.accessibility.XAccessible;
-import com.sun.star.awt.XExtendedToolkit;
-import com.sun.star.frame.XFrame;
-import com.sun.star.frame.XTerminateListener;
-import com.sun.star.lang.EventObject;
-import com.sun.star.uno.UnoRuntime;
-
-import org.openoffice.accessibility.misc.MessageArea;
-import org.openoffice.accessibility.misc.Options;
-import org.openoffice.accessibility.misc.OfficeConnection;
-import org.openoffice.accessibility.misc.SimpleOffice;
-import org.openoffice.accessibility.awb.canvas.Canvas;
-import org.openoffice.accessibility.awb.tree.AccessibilityTree;
-import org.openoffice.accessibility.awb.tree.AccessibilityModel;
-import org.openoffice.accessibility.awb.tree.DynamicAccessibilityModel;
-import org.openoffice.accessibility.awb.view.ObjectViewContainer;
-import org.openoffice.accessibility.awb.view.ObjectViewContainerWindow;
-
-
-
-/** This class manages the GUI of the work bench.
-    @see AccessibilityTreeModel
-        for the implementation of the tree view on the left side which also
-        manages the registration of accessibility listeners.
-    @see Canvas
-        for the graphical view of the accessible objects.
-*/
-public class AccessibilityWorkBench
-            extends JFrame
-            implements XTerminateListener,
-                       ActionListener,
-                       TreeSelectionListener
-{
-    public static final String msVersion = "v1.9";
-    public String msOptionsFileName = ".AWBrc";
-
-    public static void main (String args[])
-    {
-        String sPipeName = System.getenv( "USER" );
-
-        for (int i=0; i<args.length; i++)
-        {
-            if (args[i].equals ("-h") || args[i].equals ("--help") || args[i].equals ("-?"))
-            {
-                System.out.println ("usage: AccessibilityWorkBench <option>*");
-                System.out.println ("options:");
-                System.out.println (" -p <pipe-name>    name of the pipe to use to connect to OpenOffice.org.");
-                System.out.println ("                   Defaults to $USER.");
-                System.exit (0);
-            }
-            else if (args[i].equals ("-p"))
-            {
-                sPipeName = args[++i];
-            }
-        }
-
-        saWorkBench = new AccessibilityWorkBench (sPipeName);
-    }
-
-
-
-
-    /** Return the one instance of the AccessibilityWorkBench
-        @return
-            Returns null when the AccessibilityWorkBench could not be
-            created successfully.
-    */
-    public static AccessibilityWorkBench Instance ()
-    {
-        return saWorkBench;
-    }
-
-
-
-    /** Create an accessibility work bench that listens at the specified
-        port to Office applications.
-    */
-    private AccessibilityWorkBench (String sPipeName)
-    {
-        mbInitialized = false;
-
-        OfficeConnection.SetPipeName (sPipeName);
-        Options.Instance().Load (msOptionsFileName);
-        Layout ();
-
-        MessageArea.println (System.getProperty ("os.name") + " / "
-            + System.getProperty ("os.arch") + " / "
-            + System.getProperty ("os.version"));
-        MessageArea.println ("Using pipe name " + sPipeName);
-
-        maTree.addTreeSelectionListener (this);
-
-        addWindowListener (new WindowAdapter ()
-            { public void windowClosing (WindowEvent e) {Quit();} }
-            );
-
-        OfficeConnection.Instance().AddConnectionListener (this);
-        Initialize ();
-    }
-
-
-
-
-    /** Create and arrange the widgets of the GUI.
-    */
-    public void Layout ()
-    {
-        setSize (new java.awt.Dimension (800,600));
-
-        JScrollPane aScrollPane;
-        GridBagConstraints constraints;
-
-        // Create new layout.
-        java.awt.GridBagLayout aLayout = new java.awt.GridBagLayout ();
-        getContentPane().setLayout (aLayout);
-
-        //  Accessible Tree.
-        javax.swing.tree.TreeModel treeModel = new DynamicAccessibilityModel();
-        maTree = new AccessibilityTree(treeModel);
-        // Add the model as tree listeners to be able to populate/clear the
-        // child lists on demand.
-        maTree.addTreeExpansionListener((TreeExpansionListener) treeModel);
-        maTree.addTreeWillExpandListener((TreeWillExpandListener) treeModel);
-
-        JScrollPane aTreeScrollPane = new JScrollPane(
-            maTree,
-            JScrollPane.VERTICAL_SCROLLBAR_ALWAYS,
-            JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS);
-        aTreeScrollPane.setPreferredSize (new java.awt.Dimension (400,300));
-
-        // Object view shows details about the currently selected accessible
-        // object.
-        maObjectViewContainer = new ObjectViewContainer ();
-        JScrollPane aObjectViewContainerScrollPane = new JScrollPane(
-            maObjectViewContainer,
-            JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
-            JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
-        aObjectViewContainerScrollPane.setPreferredSize (
-            new java.awt.Dimension (400,300));
-        JButton aCornerButton = new JButton ("CreateNewViewWindow");
-        aCornerButton.addActionListener (this);
-        aObjectViewContainerScrollPane.setCorner (
-            JScrollPane.LOWER_RIGHT_CORNER,
-            aCornerButton);
-
-        // Split pane for tree view and object view.
-        JSplitPane aLeftViewSplitPane = new JSplitPane (
-            JSplitPane.VERTICAL_SPLIT,
-            aTreeScrollPane,
-            aObjectViewContainerScrollPane
-            );
-        aLeftViewSplitPane.setDividerLocation (300);
-        aLeftViewSplitPane.setContinuousLayout (true);
-
-        //  Canvas.
-        maCanvas = new Canvas ();
-        maCanvas.SetTree (maTree);
-        JScrollPane aScrolledCanvas = new JScrollPane(maCanvas,
-            JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
-            JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
-        aScrolledCanvas.getViewport().setBackground (java.awt.Color.RED);
-        aScrolledCanvas.setPreferredSize (new java.awt.Dimension(600,400));
-
-        // Split pane for tree view and canvas.
-        JSplitPane aViewSplitPane = new JSplitPane (
-            JSplitPane.HORIZONTAL_SPLIT,
-            aLeftViewSplitPane,
-            aScrolledCanvas
-            );
-        aViewSplitPane.setOneTouchExpandable(true);
-        aViewSplitPane.setDividerLocation (400);
-        aViewSplitPane.setContinuousLayout (true);
-
-        // Split pane for the three views at the top and the message area.
-        MessageArea.Instance().setPreferredSize (new java.awt.Dimension(600,50));
-        JSplitPane aSplitPane = new JSplitPane (
-            JSplitPane.VERTICAL_SPLIT,
-            aViewSplitPane,
-            MessageArea.Instance());
-        aSplitPane.setOneTouchExpandable(true);
-        aSplitPane.setContinuousLayout (true);
-        addGridElement (aSplitPane, 0,0, 2,1, 3,3,
-            GridBagConstraints.CENTER, GridBagConstraints.BOTH);
-
-        // Button bar.
-        maButtonBar = new javax.swing.JPanel();
-        java.awt.GridBagLayout aButtonLayout = new java.awt.GridBagLayout ();
-        maButtonBar.setLayout (new java.awt.FlowLayout());
-        addGridElement (maButtonBar, 0,3, 2,1, 1,0,
-            GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL);
-
-        //  Buttons.
-        //        maConnectButton = createButton ("Connect", "connect");
-        //        maUpdateButton = createButton ("Update", "update");
-        //        maShapesButton = createButton ("Expand Shapes", "shapes");
-        maExpandButton = createButton ("Expand All", "expand");
-        maQuitButton = createButton ("Quit", "quit");
-        UpdateButtonStates ();
-
-        setJMenuBar (CreateMenuBar ());
-
-        setTitle("Accessibility Workbench " + msVersion);
-
-        setVisible (true);
-        pack ();
-        aSplitPane.setDividerLocation (1.0);
-        validate ();
-        repaint();
-    }
-
-
-
-
-    /** Shortcut method for adding an object to a GridBagLayout.
-    */
-    void addGridElement (JComponent object,
-        int x, int y,
-        int width, int height,
-        int weightx, int weighty,
-        int anchor, int fill)
-    {
-        GridBagConstraints constraints = new GridBagConstraints ();
-        constraints.gridx = x;
-        constraints.gridy = y;
-        constraints.gridwidth = width;
-        constraints.gridheight = height;
-        constraints.weightx = weightx;
-        constraints.weighty = weighty;
-        constraints.anchor = anchor;
-        constraints.fill = fill;
-        getContentPane().add (object, constraints);
-    }
-
-
-
-
-    /** Create a new button and place at the right most position into the
-        button bar.
-    */
-    public JButton createButton (String title, String command)
-    {
-        JButton aButton = new JButton (title);
-        aButton.setEnabled (false);
-        aButton.setActionCommand (command);
-        aButton.addActionListener (this);
-
-        maButtonBar.add (aButton);
-        return aButton;
-    }
-
-
-
-
-    /** Create a menu bar for the application.
-        @return
-            Returns the new menu bar.  The returned reference is also
-            remembered in the data member <member>maMenuBar</member>.
-    */
-    javax.swing.JMenuBar CreateMenuBar()
-    {
-        // Menu bar.
-        maMenuBar = new JMenuBar ();
-
-        // File menu.
-        JMenu aFileMenu = new JMenu ("File");
-        maMenuBar.add (aFileMenu);
-        JMenuItem aItem;
-        aItem = new JMenuItem ("Quit");
-        aFileMenu.add (aItem);
-        aItem.addActionListener (this);
-
-        // View menu.
-        JMenu aViewMenu = new JMenu ("View");
-        maMenuBar.add (aViewMenu);
-        ButtonGroup aGroup = new ButtonGroup ();
-        int nZoomMode = Options.GetInteger ("ZoomMode", Canvas.WHOLE_SCREEN);
-        JRadioButtonMenuItem aRadioButton = new JRadioButtonMenuItem (
-            "Whole Screen", nZoomMode==Canvas.WHOLE_SCREEN);
-        aGroup.add (aRadioButton);
-        aViewMenu.add (aRadioButton);
-        aRadioButton.addActionListener (this);
-        aRadioButton = new JRadioButtonMenuItem ("200%", nZoomMode==200);
-        aGroup.add (aRadioButton);
-        aViewMenu.add (aRadioButton);
-        aRadioButton.addActionListener (this);
-        aRadioButton = new JRadioButtonMenuItem ("100%", nZoomMode==100);
-        aGroup.add (aRadioButton);
-        aViewMenu.add (aRadioButton);
-        aRadioButton.addActionListener (this);
-        aRadioButton = new JRadioButtonMenuItem ("50%", nZoomMode==50);
-        aGroup.add (aRadioButton);
-        aViewMenu.add (aRadioButton);
-        aRadioButton.addActionListener (this);
-        aRadioButton = new JRadioButtonMenuItem ("25%", nZoomMode==25);
-        aGroup.add (aRadioButton);
-        aViewMenu.add (aRadioButton);
-        aRadioButton.addActionListener (this);
-        aRadioButton = new JRadioButtonMenuItem ("10%", nZoomMode==10);
-        aGroup.add (aRadioButton);
-        aViewMenu.add (aRadioButton);
-        aRadioButton.addActionListener (this);
-
-        // Options menu.
-        JMenu aOptionsMenu = new JMenu ("Options");
-        maMenuBar.add (aOptionsMenu);
-        JCheckBoxMenuItem aCBItem;
-        aCBItem = new JCheckBoxMenuItem ("Show Descriptions",
-                                         Options.GetBoolean("ShowDescriptions"));
-        aOptionsMenu.add (aCBItem);
-        aCBItem.addActionListener (this);
-
-        aCBItem = new JCheckBoxMenuItem ("Show Names",
-                                         Options.GetBoolean ("ShowNames"));
-        aOptionsMenu.add (aCBItem);
-        aCBItem.addActionListener (this);
-
-        aCBItem = new JCheckBoxMenuItem ("Show Text",
-                                         Options.GetBoolean ("ShowText"));
-        aOptionsMenu.add (aCBItem);
-        aCBItem.addActionListener (this);
-
-        aCBItem = new JCheckBoxMenuItem ("Antialiased Rendering",
-                                         Options.GetBoolean ("Antialiasing"));
-        aOptionsMenu.add (aCBItem);
-        aCBItem.addActionListener (this);
-
-        // Help menu.
-        JMenu aHelpMenu = new JMenu ("Help");
-        maMenuBar.add (aHelpMenu);
-
-        aItem = new JMenuItem ("Help");
-        aHelpMenu.add (aItem);
-        aItem.addActionListener (this);
-
-        aItem = new JMenuItem ("News");
-        aHelpMenu.add (aItem);
-        aItem.addActionListener (this);
-
-        aItem = new JMenuItem ("About");
-        aHelpMenu.add (aItem);
-        aItem.addActionListener (this);
-
-        return maMenuBar;
-    }
-
-
-
-
-    /** Initialize the AWB.  This includes clearing the canvas, add
-        listeners, creation of a new tree model for the tree list box and
-        the update of the button states.
-
-        This method may be called any number of times.  Note that all
-        actions will be carried out every time.  The main purpose of a
-        second call is that of a re-initialization after a reconnect.
-    */
-    protected void Initialize ()
-    {
-        maCanvas.SetTree (maTree);
-
-        SimpleOffice aOffice = SimpleOffice.Instance ();
-        if (aOffice != null)
-        {
-            // Add terminate listener.
-            if (aOffice.GetDesktop() != null)
-                aOffice.GetDesktop().addTerminateListener (this);
-
-        }
-
-        mbInitialized = true;
-        UpdateButtonStates ();
-    }
-
-
-
-
-    /** Update the states of the buttons according to the internal state of
-        the AWB.
-    */
-    protected void UpdateButtonStates ()
-    {
-        //        maConnectButton.setEnabled (mbInitialized);
-        maQuitButton.setEnabled (true);
-        //        maUpdateButton.setEnabled (mbInitialized);
-        maExpandButton.setEnabled (mbInitialized);
-        //        maShapesButton.setEnabled (mbInitialized);
-    }
-
-
-
-    /** Callback for GUI actions from the buttons.
-    */
-    public void actionPerformed (ActionEvent aEvent)
-    {
-        String sCommand = aEvent.getActionCommand();
-        if (sCommand.equals("connect"))
-        {
-            SimpleOffice.Clear();
-            Initialize ();
-        }
-        else if (sCommand.equals("quit"))
-        {
-            Quit ();
-        }
-        else if (sCommand.equals("update"))
-        {
-//          maTree.Dispose();
-            Initialize ();
-        }
-        else if (sCommand.equals("shapes"))
-        {
-            Cursor aCursor = getCursor();
-            setCursor (new Cursor (Cursor.WAIT_CURSOR));
-            //            maTree.expandShapes();
-            setCursor (aCursor);
-        }
-        else if (sCommand.equals("expand"))
-        {
-            Cursor aCursor = getCursor();
-            setCursor (new Cursor (Cursor.WAIT_CURSOR));
-
-            for (int i=0; i<maTree.getRowCount(); i++)
-                maTree.expandRow (i);
-            //            maAccessibilityTree.expandAll();
-            setCursor (aCursor);
-        }
-        else if (sCommand.equals ("Quit"))
-        {
-            System.out.println ("exiting");
-            System.exit (0);
-        }
-        else if (sCommand.equals ("Show Descriptions"))
-        {
-            Options.SetBoolean ("ShowDescriptions",
-                ((JCheckBoxMenuItem)aEvent.getSource()).getState());
-            maCanvas.repaint();
-        }
-        else if (sCommand.equals ("Show Names"))
-        {
-            Options.SetBoolean ("ShowNames",
-                ((JCheckBoxMenuItem)aEvent.getSource()).getState());
-            maCanvas.repaint();
-        }
-        else if (sCommand.equals ("Show Text"))
-        {
-            Options.SetBoolean ("ShowText",
-                ((JCheckBoxMenuItem)aEvent.getSource()).getState());
-            maCanvas.repaint();
-        }
-        else if (sCommand.equals ("Antialiased Rendering"))
-        {
-            Options.SetBoolean ("Antialiasing",
-                ((JCheckBoxMenuItem)aEvent.getSource()).getState());
-            maCanvas.repaint();
-        }
-        else if (sCommand.equals ("Help"))
-        {
-            HelpWindow.Instance().loadFile ("help.html");
-        }
-        else if (sCommand.equals ("News"))
-        {
-            try{
-                HelpWindow.Instance().loadFile ("news.html");
-            } catch (Exception ex) {}
-        }
-        else if (sCommand.equals ("About"))
-        {
-            HelpWindow.Instance().loadFile ("about.html");
-        }
-        else if (sCommand.equals ("Whole Screen"))
-        {
-            Options.SetInteger ("ZoomMode", Canvas.WHOLE_SCREEN);
-            maCanvas.repaint();
-        }
-        else if (sCommand.equals ("200%"))
-        {
-            Options.SetInteger ("ZoomMode", 200);
-            maCanvas.repaint();
-        }
-        else if (sCommand.equals ("100%"))
-        {
-            Options.SetInteger ("ZoomMode", 100);
-            maCanvas.repaint();
-        }
-        else if (sCommand.equals ("50%"))
-        {
-            Options.SetInteger ("ZoomMode", 50);
-            maCanvas.repaint();
-        }
-        else if (sCommand.equals ("25%"))
-        {
-            Options.SetInteger ("ZoomMode", 25);
-            maCanvas.repaint();
-        }
-        else if (sCommand.equals ("10%"))
-        {
-            Options.SetInteger ("ZoomMode", 10);
-            maCanvas.repaint();
-        }
-        else if (sCommand.equals ("<connected>"))
-        {
-            Connected ();
-        }
-        else if (sCommand.equals ("CreateNewViewWindow"))
-        {
-            TreePath aSelectionPath = maTree.getSelectionPath();
-            if (aSelectionPath != null)
-            {
-                javax.swing.tree.TreeNode aSelectedNode =
-                    (javax.swing.tree.TreeNode)aSelectionPath.getLastPathComponent();
-                if (aSelectedNode instanceof XAccessible) {
-                   new ObjectViewContainerWindow (((XAccessible) aSelectedNode).getAccessibleContext());
-                }
-            }
-        }
-        else
-        {
-            System.err.println("unknown command " + sCommand);
-        }
-    }
-
-
-
-
-    /** TreeSelectionListener
-        Tell the object view and the canvas about the selected object.
-    */
-    public void valueChanged (TreeSelectionEvent aEvent) {
-
-        if (aEvent.isAddedPath()) {
-            Cursor aCursor = getCursor();
-            setCursor (new Cursor (Cursor.WAIT_CURSOR));
-
-            javax.swing.tree.TreePath aPath = aEvent.getPath();
-            maTree.scrollPathToVisible (aPath);
-            Object aObject = aPath.getLastPathComponent();
-            implSetCurrentObject( aObject );
-            if (aObject instanceof XAccessible)
-            {
-                if (maObjectViewContainer != null)
-                    maObjectViewContainer.SetObject( ((XAccessible)aObject).getAccessibleContext() );
-            }
-            if (maCanvas != null)
-                maCanvas.SelectObject ((TreeNode) aObject);
-            setCursor (aCursor);
-        } else {
-            implSetCurrentObject( aEvent.getPath().getLastPathComponent() );
-            if (maObjectViewContainer != null)
-                maObjectViewContainer.SetObject (null);
-            if (maCanvas != null)
-                maCanvas.SelectObject (null);
-        }
-    }
-
-
-    private void implSetCurrentObject( Object i_object )
-    {
-        if ( maObjectViewContainer == null )
-            return;
-        if ( maCurrentObject != null )
-        {
-            AccessibilityModel.removeEventListener( (TreeNode)maCurrentObject, maObjectViewContainer );
-        }
-        maCurrentObject = i_object;
-        if ( maCurrentObject != null )
-        {
-            AccessibilityModel.addEventListener( (TreeNode)maCurrentObject, maObjectViewContainer );
-        }
-    }
-
-    // XEventListener
-    public void disposing (EventObject aSourceObj)
-    {
-        XFrame xFrame = (XFrame)UnoRuntime.queryInterface(
-            XFrame.class, aSourceObj.Source);
-
-        if( xFrame != null )
-            System.out.println("frame disposed");
-        else
-            System.out.println("controller disposed");
-    }
-
-
-
-
-    // XTerminateListener
-    public void queryTermination(final EventObject aEvent) throws com.sun.star.frame.TerminationVetoException
-    {
-        System.out.println ("Terminate Event : " + aEvent);
-    }
-
-
-
-
-    // XTerminateListener
-    public void notifyTermination(final EventObject aEvent)
-    {
-        System.out.println ("Notifiy Termination Event : " + aEvent);
-    }
-
-
-    /** Called after the AWB is connected to an Office application.
-    */
-    private void Connected ()
-    {
-        // Clear the tree and by expanding the root node initiate the
-        // scanning and insertion of nodes for the top-level windows.
-//        maTree.Clear();
-//        maTree.collapseRow (0);
-//        maTree.expandRow (0);
-
-        // Register the top window listener.
-        XExtendedToolkit xToolkit =
-            SimpleOffice.Instance().GetExtendedToolkit();
-        if (xToolkit != null)
-        {
-            maTree.setToolkit(xToolkit);
-        }
-    }
-
-
-    /** Called when shutting down the AWB tool.
-    */
-    private void Quit ()
-    {
-//        maTree.Dispose();
-        System.exit (0);
-    }
-
-    /// The Singleton Workbench object.
-    private static AccessibilityWorkBench
-        saWorkBench = null;
-
-    private JPanel maMainPanel;
-    private JPanel maButtonBar;
-    private Canvas maCanvas;
-    private AccessibilityTree maTree;
-    private ObjectViewContainer maObjectViewContainer;
-    private JButton
-        maConnectButton,
-        maQuitButton,
-        maUpdateButton,
-        maExpandButton,
-        maShapesButton;
-    private JMenuBar maMenuBar;
-    private boolean mbInitialized;
-    private Object maCurrentObject = null;
-}
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/HelpWindow.java b/accessibility/workben/org/openoffice/accessibility/awb/HelpWindow.java
deleted file mode 100644
index aea73ec..0000000
--- a/accessibility/workben/org/openoffice/accessibility/awb/HelpWindow.java
+++ /dev/null
@@ -1,187 +0,0 @@
-package org.openoffice.accessibility.awb;
-
-import javax.swing.JFrame;
-import javax.swing.JScrollPane;
-import javax.swing.JEditorPane;
-import javax.swing.JButton;
-import java.net.URL;
-import javax.swing.event.HyperlinkListener;
-import javax.swing.event.HyperlinkEvent;
-import java.net.MalformedURLException;
-import java.io.IOException;
-import java.io.File;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import java.awt.GridBagLayout;
-import java.awt.GridBagConstraints;
-import java.awt.event.ActionListener;
-import java.util.LinkedList;
-
-public class HelpWindow
-    implements ActionListener
-{
-    public static synchronized HelpWindow Instance ()
-    {
-        if (maInstance == null)
-            maInstance = new HelpWindow();
-        return maInstance;
-    }
-
-    public void loadFile (String sFilename)
-    {
-        File aFile = new File (sFilename);
-        try
-        {
-            loadURL (aFile.toURI().toURL());
-        }
-        catch (MalformedURLException e)
-        {
-            e.printStackTrace (System.err);
-        }
-    }
-    public void loadURL (String sURL)
-    {
-        try
-        {
-            loadURL (new URL (sURL));
-        }
-        catch (MalformedURLException e)
-        {
-            e.printStackTrace (System.err);
-        }
-    }
-
-
-
-
-    public void loadURL (URL aURL)
-    {
-        maHistory.addLast (aURL);
-        selectHistoryPage (maHistory.size()-1);
-        maFrame.toFront ();
-    }
-
-
-
-
-    private HelpWindow ()
-    {
-        try
-        {
-            maCurrentHistoryEntry = -1;
-            maHistory = new LinkedList();
-
-            maFrame = new JFrame ();
-            maFrame.addWindowListener (new WindowAdapter ()
-                {
-                    public void windowClosing (WindowEvent e)
-                    {
-                        maInstance = null;
-                    }
-                });
-            maContent = createContentWidget();
-
-            maFrame.getContentPane().setLayout (new GridBagLayout());
-            GridBagConstraints aConstraints = new GridBagConstraints ();
-            aConstraints.gridx = 0;
-            aConstraints.gridy = 0;
-            aConstraints.gridwidth = 3;
-            aConstraints.weightx = 1;
-            aConstraints.weighty = 1;
-            aConstraints.fill = GridBagConstraints.BOTH;
-            maFrame.getContentPane().add (new JScrollPane (maContent), aConstraints);
-
-            aConstraints = new GridBagConstraints();
-            aConstraints.gridx = 0;
-            aConstraints.gridy = 1;
-            maPrevButton = new JButton ("Prev");
-            maFrame.getContentPane().add (maPrevButton, aConstraints);
-            maPrevButton.addActionListener (this);
-
-            aConstraints = new GridBagConstraints();
-            aConstraints.gridx = 1;
-            aConstraints.gridy = 1;
-            maNextButton = new JButton ("Next");
-            maFrame.getContentPane().add (maNextButton, aConstraints);
-            maNextButton.addActionListener (this);
-
-            aConstraints = new GridBagConstraints();
-            aConstraints.gridx = 2;
-            aConstraints.gridy = 1;
-            aConstraints.anchor = GridBagConstraints.EAST;
-            JButton aButton = new JButton ("Close");
-            maFrame.getContentPane().add (aButton, aConstraints);
-            aButton.addActionListener (this);
-
-            maFrame.setSize (600,400);
-            maFrame.setVisible (true);
-        }
-        catch (Exception e)
-        {}
-    }
-
-    public void actionPerformed (java.awt.event.ActionEvent e)
-    {
-        if (e.getActionCommand().equals("Prev"))
-        {
-            selectHistoryPage (maCurrentHistoryEntry - 1);
-        }
-        else if (e.getActionCommand().equals("Next"))
-        {
-            selectHistoryPage (maCurrentHistoryEntry + 1);
-        }
-        else if (e.getActionCommand().equals("Close"))
-        {
-            maFrame.dispose ();
-            maInstance = null;
-        }
-    }
-
-    private JEditorPane createContentWidget ()
-    {
-        JEditorPane aContent = new JEditorPane ();
-        aContent.setEditable (false);
-        aContent.addHyperlinkListener (new HyperlinkListener()
-            {
-                public void hyperlinkUpdate (HyperlinkEvent e)
-                {
-                    if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED)
-                        HelpWindow.Instance().loadURL (e.getURL());
-                }
-            });
-        return aContent;
-    }
-
-    private void selectHistoryPage (int i)
-    {
-        if (i < 0)
-            i = 0;
-        else if (i >= maHistory.size()-1)
-            i = maHistory.size()-1;
-        if (i != maCurrentHistoryEntry)
-        {
-            URL aURL = (URL)maHistory.get (i);
-            try
-            {
-                maContent.setPage (aURL);
-            }
-            catch (java.io.IOException ex)
-            {
-                ex.printStackTrace(System.err);
-            }
-
-            maCurrentHistoryEntry = i;
-        }
-
-        maPrevButton.setEnabled (maCurrentHistoryEntry > 0);
-        maNextButton.setEnabled (maCurrentHistoryEntry < maHistory.size()-1);
-    }
-
-    private static HelpWindow maInstance = null;
-    private JFrame maFrame;
-    private JEditorPane maContent;
-    private LinkedList maHistory;
-    private int maCurrentHistoryEntry;
-    private JButton maPrevButton;
-    private JButton maNextButton;
-}
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/Makefile b/accessibility/workben/org/openoffice/accessibility/awb/Makefile
deleted file mode 100644
index 88a004e..0000000
--- a/accessibility/workben/org/openoffice/accessibility/awb/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-all : package
-
-ROOT=../../../..
-PACKAGE = org.openoffice.accessibility.awb
-SUBDIRS = canvas event tree view
-
-include makefile.common
-
-include $(ROOT)/makefile.in
-
-package: subdirs $(CLASS_FILES)
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/canvas/Canvas.java b/accessibility/workben/org/openoffice/accessibility/awb/canvas/Canvas.java
deleted file mode 100644
index 86b642e..0000000
--- a/accessibility/workben/org/openoffice/accessibility/awb/canvas/Canvas.java
+++ /dev/null
@@ -1,322 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-package org.openoffice.accessibility.awb.canvas;
-
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.Rectangle;
-import java.awt.RenderingHints;
-import java.awt.Toolkit;
-import java.awt.geom.Rectangle2D;
-import java.util.Iterator;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JViewport;
-import javax.swing.event.TreeSelectionEvent;
-import javax.swing.tree.TreePath;
-
-import com.sun.star.accessibility.XAccessible;
-import com.sun.star.accessibility.XAccessibleContext;
-import com.sun.star.accessibility.XAccessibleComponent;
-
-import org.openoffice.accessibility.misc.Options;
-
-/** This canvas displays accessible objects graphically.  Each accessible
-    object with graphical representation is represented by an
-    CanvasShape object and has to be added by the
-    <member>addAccessible</member> member function.
-
-    <p>The canvas listens to selection events of the associated JTree and
-    highlights the first selected node of that tree.</p>
-*/
-public class Canvas
-    extends JPanel
-{
-    // This constant can be passed to SetZoomMode to always show the whole screen.
-    public static final int WHOLE_SCREEN = -1;
-
-    public Canvas ()
-    {
-        super (true);
-        maShapeList = new ShapeContainer (this);
-        maMouseObserver = new MouseObserver (this);
-        maTree = null;
-        mnHOffset = 0;
-        mnVOffset = 0;
-        mnScale = 1;
-        maLastWidgetSize = new Dimension (0,0);
-    }
-
-
-
-    /** Tell the canvas which tree to use to highlight accessible
-        objects and to observe for changes in the tree structure.
-    */
-    public void SetTree (javax.swing.JTree aTree)
-    {
-        if (aTree != maTree)
-        {
-            maTree = aTree;
-            maShapeList.SetTree (maTree);
-            maMouseObserver.SetTree (maTree);
-        }
-    }
-
-
-
-
-    private void Clear ()
-    {
-        maShapeList.Clear();
-    }
-
-
-
-
-    public Iterator GetShapeIterator ()
-    {
-        return maShapeList.GetIterator();
-    }
-
-
-
-
-    public void paintComponent (Graphics g)
-    {
-        synchronized (g)
-        {
-            super.paintComponent (g);
-
-            Graphics2D g2 = (Graphics2D)g;
-            if (Options.GetBoolean("Antialiasing"))
-                g2.setRenderingHint (RenderingHints.KEY_ANTIALIASING,
-                    RenderingHints.VALUE_ANTIALIAS_ON);
-            else
-                g2.setRenderingHint (RenderingHints.KEY_ANTIALIASING,
-                    RenderingHints.VALUE_ANTIALIAS_OFF);
-
-            setupTransformation ();
-            g2.translate (mnHOffset, mnVOffset);
-            g2.scale (mnScale, mnScale);
-
-            // Draw the screen representation to give a hint of the location of the
-            // accessible object on the screen.
-            Dimension aScreenSize = Toolkit.getDefaultToolkit().getScreenSize();
-            Rectangle2D.Double aScreen = new Rectangle2D.Double (
-                0,
-                0,
-                aScreenSize.getWidth(),
-                aScreenSize.getHeight());
-            // Fill the screen rectangle and draw a frame arround it to increase its visibility.
-            g2.setColor (new Color (250,240,230));
-            g2.fill (aScreen);
-            g2.setColor (Color.BLACK);
-            g2.draw (aScreen);
-
-            synchronized (maShapeList)
-            {
-                Iterator aShapeIterator = maShapeList.GetIterator();
-                boolean bShowDescriptions = Options.GetBoolean ("ShowDescriptions");
-                boolean bShowNames = Options.GetBoolean ("ShowNames");
-                boolean bShowText = Options.GetBoolean ("ShowText");
-                while (aShapeIterator.hasNext())
-                {
-                    CanvasShape aCanvasShape =
-                        (CanvasShape)aShapeIterator.next();
-                    try
-                    {
-                        aCanvasShape.paint (
-                            g2,
-                            bShowDescriptions, bShowNames, bShowText);
-                    }
-                    catch (Exception aException)
-                    {
-                        System.err.println ("caught exception while painting a shape:"
-                            + aException);
-                        aException.printStackTrace (System.err);
-                    }
-                }
-            }
-
-            // Paint highlighted frame around active object as the last thing.
-            if (maActiveObject != null)
-                maActiveObject.paint_highlight (g2);
-        }
-    }
-
-
-
-
-    /** Set up the transformation so that the graphical display can show a
-        centered representation of the whole screen.
-    */
-    private void setupTransformation ()
-    {
-        // Turn off scrollbars when showing the whole screen.  Otherwise show them when needed.
-        JViewport aViewport = (JViewport)getParent();
-        JScrollPane aScrollPane = (JScrollPane)aViewport.getParent();
-        int nZoomMode = Options.GetInteger ("ZoomMode", WHOLE_SCREEN);
-        if (nZoomMode == WHOLE_SCREEN)
-        {
-            if (aScrollPane.getHorizontalScrollBarPolicy()
-                != JScrollPane.HORIZONTAL_SCROLLBAR_NEVER)
-                aScrollPane.setHorizontalScrollBarPolicy (
-                    JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
-            if (aScrollPane.getVerticalScrollBarPolicy()
-                != JScrollPane.VERTICAL_SCROLLBAR_NEVER)
-                aScrollPane.setVerticalScrollBarPolicy (
-                    JScrollPane.VERTICAL_SCROLLBAR_NEVER);
-        }
-        else
-        {
-            if (aScrollPane.getHorizontalScrollBarPolicy()
-                != JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED)
-                aScrollPane.setHorizontalScrollBarPolicy (
-                    JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
-            if (aScrollPane.getVerticalScrollBarPolicy()
-                != JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED)
-                aScrollPane.setVerticalScrollBarPolicy (
-                    JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);
-        }
-
-        Dimension aScreenSize = Toolkit.getDefaultToolkit().getScreenSize();
-        Dimension aWidgetSize = aViewport.getSize();
-        {
-            if ((aScreenSize.getWidth() > 0) && (aScreenSize.getHeight() > 0))
-            {
-                if (nZoomMode == WHOLE_SCREEN)
-                {
-                    // Calculate the scales that would map the screen onto the
-                    // widget in both of the coordinate axes and select the
-                    // smaller
-                    // of the two: it maps the screen onto the widget in both
-                    // axes at the same time.
-                    double nHScale = (aWidgetSize.getWidth() - 10)
-                           / aScreenSize.getWidth();
-                    double nVScale = (aWidgetSize.getHeight() - 10)
-                        / aScreenSize.getHeight();
-                    if (nHScale < nVScale)
-                        mnScale = nHScale;
-                    else
-                        mnScale = nVScale;
-                }
-                else
-                {
-                    mnScale = nZoomMode / 100.0;
-                }
-
-                // Calculate offsets that center the scaled screen inside
-                // the widget.
-                mnHOffset = (aWidgetSize.getWidth()
-                             - mnScale*aScreenSize.getWidth()) / 2.0;
-                mnVOffset = (aWidgetSize.getHeight()
-                             - mnScale*aScreenSize.getHeight()) / 2.0;
-                if (mnHOffset < 0)
-                    mnHOffset = 0;
-                if (mnVOffset < 0)
-                    mnVOffset = 0;
-
-                setPreferredSize (new Dimension (
-                    (int)(2*mnHOffset + mnScale * aScreenSize.getWidth()),
-                    (int)(2*mnVOffset + mnScale * aScreenSize.getHeight())));
-                revalidate ();
-            }
-            else
-            {
-                // In case of a degenerate (not yet initialized?) screen size
-                // use some meaningless default values.
-                mnScale = 1;
-                mnHOffset = 0;
-                mnVOffset = 0;
-            }
-        }
-        maLastWidgetSize = aWidgetSize;
-    }
-
-
-
-    protected boolean HighlightObject (CanvasShape aNewActiveObject)
-    {
-        if (aNewActiveObject != maActiveObject)
-        {
-            if (maActiveObject != null)
-                maActiveObject.Highlight (false);
-
-            maActiveObject = aNewActiveObject;
-            if (maActiveObject != null)
-            {
-                /*           if (maTree != null)
-                {
-                    TreePath aPath = new TreePath (
-                        maActiveObject.GetNode().GetPath());
-                    maTree.scrollPathToVisible (aPath);
-                    maTree.setSelectionPath (aPath);
-                    maTree.repaint ();
-                }
-                */
-                maActiveObject.Highlight (true);
-            }
-            repaint ();
-            return true;
-        }
-        else
-            return false;
-    }
-
-
-
-
-    /** Called when the selection of the tree changes.  Highlight the
-        corresponding graphical representation of the object.
-    */
-    public void SelectObject (javax.swing.tree.TreeNode aNode)
-    {
-        CanvasShape aCanvasShape = maShapeList.Get (aNode);
-        HighlightObject (aCanvasShape);
-    }
-
-
-
-
-    private int
-        mnXAnchor,
-        mnYAnchor,
-        maResizeFlag;
-    private double
-        mnHOffset,
-        mnVOffset,
-        mnScale;
-    private CanvasShape maActiveObject;
-    private javax.swing.JTree maTree;
-    // The size of the widget at the last call of setupTransformation()
-    private Dimension maLastWidgetSize;
-    private ShapeContainer maShapeList;
-    private MouseObserver maMouseObserver;
-}
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/canvas/CanvasShape.java b/accessibility/workben/org/openoffice/accessibility/awb/canvas/CanvasShape.java
deleted file mode 100644
index f259535..0000000
--- a/accessibility/workben/org/openoffice/accessibility/awb/canvas/CanvasShape.java
+++ /dev/null
@@ -1,412 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-package org.openoffice.accessibility.awb.canvas;
-
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Graphics2D;
-import java.awt.Point;
-import java.awt.Rectangle;
-import java.awt.geom.Point2D;
-import java.awt.geom.Rectangle2D;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.NoninvertibleTransformException;
-
-
-import com.sun.star.accessibility.*;
-import com.sun.star.lang.EventObject;
-import com.sun.star.uno.UnoRuntime;
-
-
-class CanvasShape implements XAccessibleEventListener
-{
-    public final Color maHighlightColor = Color.red;
-    public final Color maSelectionColor = Color.green;
-    public final Color maFocusColor = Color.blue;
-
-    public CanvasShape (javax.swing.tree.TreeNode aNode, Canvas aCanvas)
-    {
-        maNode = aNode;
-        msName = "<no name>";
-        msDescription = "<no description>";
-        maShape = new Rectangle2D.Double (-10,-10,10,10);
-        maPosition = new Point (-10,-10);
-        maSize = new Dimension (10,10);
-        maFgColor = java.awt.Color.black;
-        maBgColor = Color.blue;
-        mnRole = -1;
-        mbHighlighted = false;
-        mbSelected = false;
-        mbFocused = false;
-        maCanvas = aCanvas;
-
-        Update ();
-    }
-
-
-
-
-    public javax.swing.tree.TreePath getNodePath (javax.swing.tree.TreeNode node)
-    {
-        javax.swing.tree.TreeNode parent = node.getParent();
-        return (parent != null) ?
-            getNodePath(parent).pathByAddingChild(node) :
-            new javax.swing.tree.TreePath(node);
-    }
-
-    public javax.swing.tree.TreePath getNodePath ()
-    {
-        return getNodePath(maNode);
-    }
-
-
-
-    /** Update the data obtained from the <type>AccessibilityNode</type>
-        object.
-    */
-    public void Update ()
-    {
-        if (maNode instanceof XAccessible) {
-            mxContext = ((XAccessible) maNode).getAccessibleContext();
-            mxComponent = (XAccessibleComponent)UnoRuntime.queryInterface(
-                XAccessibleComponent.class, mxContext);
-        }
-
-        if (mxContext != null)
-        {
-            msName = mxContext.getAccessibleName();
-            msDescription = mxContext.getAccessibleDescription();
-            mnRole = mxContext.getAccessibleRole();
-
-            // Extract the selected and focused flag.
-            XAccessibleStateSet xStateSet = mxContext.getAccessibleStateSet ();
-            if (xStateSet != null)
-            {
-                mbSelected = xStateSet.contains (AccessibleStateType.SELECTED);
-                mbFocused = xStateSet.contains (AccessibleStateType.FOCUSED);
-            }
-        }
-
-        UpdateGeometry ();
-
-        if (mxComponent != null)
-        {
-            // Note: alpha values in office 0..255 have to be mapped to
-            //       255..0 in Java
-            Color aCol = new Color (mxComponent.getForeground(), true);
-            maFgColor = new Color (aCol.getRed (),
-                                   aCol.getGreen (),
-                                   aCol.getBlue (),
-                                   0xff - aCol.getAlpha ());
-            aCol = new Color (mxComponent.getBackground(), true);
-            maBgColor = new Color (aCol.getRed (),
-                                   aCol.getGreen (),
-                                   aCol.getBlue (),
-                                   0xff - aCol.getAlpha ());
-        }
-    }
-
-
-
-    public void UpdateGeometry ()
-    {
-        if (mxComponent != null)
-        {
-            com.sun.star.awt.Point aLocationOnScreen =
-                mxComponent.getLocationOnScreen();
-            com.sun.star.awt.Size aSizeOnScreen = mxComponent.getSize();
-            maPosition = new Point (
-                aLocationOnScreen.X,
-                aLocationOnScreen.Y);
-            maSize = new Dimension (
-                aSizeOnScreen.Width,
-                aSizeOnScreen.Height);
-        }
-    }
-
-
-
-    /** Paint the object into the specified canvas.  It is transformed
-        according to the specified offset and scale.
-    */
-    public void paint (
-        Graphics2D g,
-        boolean bShowDescription,
-        boolean bShowName,
-        boolean bShowText)
-    {
-        try{
-            // Transform the object's position and size according to the
-            // specified offset and scale.
-            Point aLocation = new Point();
-            maShape = new Rectangle2D.Double (
-                maPosition.x,
-                maPosition.y,
-                maSize.width,
-                maSize.height);
-            maTransformation = g.getTransform();
-
-            // Fill the object's bounding box with its background color if it
-            // has no children.
-            if (mxContext.getAccessibleChildCount() == 0)
-            {
-                g.setColor (maBgColor);
-                g.fill (maShape);
-            }
-
-            // Remove alpha channel from color before drawing the frame.
-            Color color = maFgColor;
-            if (maFgColor.getAlpha()<128)
-                color = new Color (maFgColor.getRed(), maFgColor.getGreen(), maFgColor.getBlue());
-            g.setColor (color);
-            g.draw (maShape);
-
-            if (mbFocused)
-            {
-                g.setColor (maFocusColor);
-                for (int x=0; x<=2; x++)
-                    for (int y=0; y<=2; y++)
-                        g.fill (
-                            new Rectangle2D.Double (
-                                maShape.x + x/2.0 * maShape.width-3,
-                                maShape.y + y/2.0 * maShape.height-3,
-                                6,
-                                6));
-            }
-            if (mbSelected)
-            {
-                g.setColor (maSelectionColor);
-                for (int x=0; x<=2; x++)
-                    for (int y=0; y<=2; y++)
-                        g.draw (
-                            new Rectangle2D.Double (
-                                maShape.x + x/2.0 * maShape.width-2,
-                                maShape.y + y/2.0 * maShape.height-2,
-                                4,
-                                4));
-            }
-
-            // Write the object's text OR name and description.
-            g.setColor (maFgColor);
-            if (bShowName)
-                paintName (g);
-            if (bShowDescription)
-                paintDescription (g);
-            if (bShowText)
-                paintText (g);
-        }
-        catch (Exception e)
-        { // don't care
-        }
-    }
-
-
-    public void paint_highlight (Graphics2D g)
-    {
-        if (mbHighlighted)
-            g.setColor (maHighlightColor);
-        else
-            g.setColor (maFgColor);
-        g.draw (maShape);
-    }
-
-
-
-
-    private void paintName (Graphics2D g)
-    {
-        g.drawString ("Name: " + msName,
-            (float)maShape.x+5,
-            (float)maShape.y+15);
-    }
-
-
-
-    private void paintDescription (Graphics2D g)
-    {
-        g.drawString ("Description: " + msDescription,
-            (float)maShape.x+5,
-            (float)maShape.y+35);
-    }
-
-
-
-
-    private void paintText (Graphics2D g)
-    {
-        XAccessibleText xText = null;
-        // get XAccessibleText
-        xText = (XAccessibleText)UnoRuntime.queryInterface(
-            XAccessibleText.class, mxContext);
-
-        // Draw every character in the text string.
-        if (xText != null)
-        {
-            String sText = xText.getText();
-            try
-            {
-                for(int i = 0; i < sText.length(); i++)
-                {
-                    com.sun.star.awt.Rectangle aRect =
-                        xText.getCharacterBounds(i);
-
-                    double x = maShape.x + aRect.X;
-                    double y = maShape.y + aRect.Y + aRect.Height;
-
-                    g.drawString (sText.substring(i, i+1), (float)x, (float)y);
-                }
-            }
-            catch (com.sun.star.lang.IndexOutOfBoundsException e)
-            {}
-        }
-    }
-
-
-    /** Compute whether the specified point lies inside the object's
-        bounding box.
-    */
-    public boolean Contains (int x, int y)
-    {
-        Point2D aPosition = new Point2D.Double (x,y);
-        try
-        {
-            maTransformation.inverseTransform (aPosition, aPosition);
-            //            System.out.println ("transformed "+x+","+y+" to "+aPosition);
-        }
-        catch (NoninvertibleTransformException aException)
-        {
-            return false;
-        }
-        return (maShape.contains (aPosition));
-    }
-
-    public void Highlight (boolean bFlag)
-    {
-        mbHighlighted = bFlag;
-    }
-
-    public boolean IsHighlighted ()
-    {
-        return mbHighlighted;
-    }
-
-    public Rectangle GetBBox ()
-    {
-        return new Rectangle (maPosition, maSize);
-    }
-
-    public Point getOrigin ()
-    {
-        return maPosition;
-    }
-
-    public Dimension GetSize ()
-    {
-        return maSize;
-    }
-
-    public int getRole ()
-    {
-        return mnRole;
-    }
-
-    public XAccessibleContext getContext ()
-    {
-        return mxContext;
-    }
-
-    public XAccessibleComponent getComponent ()
-    {
-        return mxComponent;
-    }
-
-    public String toString ()
-    {
-        return ">"+msName+", "+msDescription+" +"+maPosition.x+"+"+maPosition.y
-            +"x"+maSize.width+"x"+maSize.height+"<";
-    }
-
-    /** */
-    public void notifyEvent(com.sun.star.accessibility.AccessibleEventObject aEvent) {
-        try {
-            switch (aEvent.EventId) {
-                case AccessibleEventId.BOUNDRECT_CHANGED:
-                case AccessibleEventId.VISIBLE_DATA_CHANGED:
-                    UpdateGeometry ();
-                    maCanvas.repaint();
-                    break;
-                default:
-                    break;
-            }
-        } catch (Exception aException) {
-            System.err.println ("caught exception while updating a shape:"
-                + aException);
-            aException.printStackTrace (System.err);
-        }
-    }
-
-    /** Callback for disposing events.
-    */
-    public void disposing (com.sun.star.lang.EventObject e)
-    {
-        System.out.println ("Disposing");
-    }
-
-
-
-
-    private Canvas
-        maCanvas;
-    private javax.swing.tree.TreeNode
-        maNode;
-    private XAccessibleContext
-        mxContext;
-    private XAccessibleComponent
-        mxComponent;
-    private String
-        msDescription,
-        msName;
-    private Rectangle2D.Double maShape;
-    private AffineTransform maTransformation;
-    private Point maPosition;
-    private Dimension
-        maTransformedSize,
-        maSize;
-    private Color
-        maFgColor,
-        maBgColor;
-    private boolean
-        // Highlighting objects is an internal concept.  Corresponds to selection in the tree view.
-        mbHighlighted,
-        // Set when the accessible object is selected.
-        mbSelected,
-        // Set when the accessible object is focused.
-        mbFocused;
-    private int
-        mnRole;
-}
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/canvas/Makefile b/accessibility/workben/org/openoffice/accessibility/awb/canvas/Makefile
deleted file mode 100644
index 078ac7e..0000000
--- a/accessibility/workben/org/openoffice/accessibility/awb/canvas/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-all : package
-
-ROOT=../../../../..
-PACKAGE = org.openoffice.accessibility.awb.canvas
-SUBDIRS =
-include makefile.common
-
-include $(ROOT)/makefile.in
-
-
-package : $(CLASS_FILES)
-
-
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/canvas/MouseObserver.java b/accessibility/workben/org/openoffice/accessibility/awb/canvas/MouseObserver.java
deleted file mode 100644
index 3e7e280..0000000
--- a/accessibility/workben/org/openoffice/accessibility/awb/canvas/MouseObserver.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package org.openoffice.accessibility.awb.canvas;
-
-import java.awt.Dimension;
-import java.awt.event.InputEvent;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
-import java.awt.event.MouseMotionListener;
-import java.util.Iterator;
-import javax.swing.tree.TreePath;
-
-
-/** Observe the mouse and highlight shapes of the canvas when clicked.
-*/
-public class MouseObserver
-    implements MouseListener,
-               MouseMotionListener
-{
-    public MouseObserver (Canvas aCanvas)
-    {
-        maCanvas = aCanvas;
-        maCanvas.addMouseListener (this);
-        maCanvas.addMouseMotionListener (this);
-    }
-
-
-    public void SetTree (javax.swing.JTree aTree)
-    {
-        maTree = aTree;
-    }
-
-    public void mouseClicked (MouseEvent e)
-    {}
-
-    public void mousePressed (MouseEvent e)
-    {
-        CanvasShape aObjectUnderMouse = FindCanvasShapeUnderMouse (e);
-        maTree.clearSelection();
-        if (aObjectUnderMouse != null)
-        {
-            TreePath aPath = aObjectUnderMouse.getNodePath();
-            if ((e.getModifiers() & InputEvent.CTRL_MASK) != 0)
-                maTree.expandPath (aPath);
-            // Selecting the entry will eventually highlight the shape.
-            maTree.setSelectionPath (aPath);
-            maTree.makeVisible (aPath);
-        }
-    }
-
-    public void mouseReleased (MouseEvent e)
-    {}
-
-    public void mouseEntered (MouseEvent e)
-    {}
-
-    public void mouseExited (MouseEvent e)
-    {}
-
-    public void mouseDragged (MouseEvent e)
-    {
-    }
-
-    public void mouseMoved (MouseEvent e)
-    {
-        if ((e.getModifiers() & InputEvent.SHIFT_MASK) != 0)
-            maCanvas.HighlightObject (FindCanvasShapeUnderMouse (e));
-    }
-
-
-    /** Search for the smallest shape that contains the mouse position.
-    */
-    protected CanvasShape FindCanvasShapeUnderMouse (MouseEvent e)
-    {
-        Dimension aSmallestSize = null;
-        Iterator maShapeIterator = maCanvas.GetShapeIterator();
-        CanvasShape aShapeUnderMouse = null;
-        while (maShapeIterator.hasNext())
-        {
-            CanvasShape aShape = (CanvasShape)maShapeIterator.next();
-            if (aShape != null)
-                if (aShape.Contains (e.getX(),e.getY()))
-                {
-                    if (aShapeUnderMouse == null)
-                    {
-                        aSmallestSize = aShape.GetSize();
-                        aShapeUnderMouse = aShape;
-                    }
-                    else
-                    {
-                        Dimension aSize = aShape.GetSize();
-                        if (aSize.getWidth()<aSmallestSize.getWidth()
-                            || aSize.getHeight()<aSmallestSize.getHeight())
-                        {
-                            aSmallestSize = aSize;
-                            aShapeUnderMouse = aShape;
-                        }
-                    }
-                }
-        }
-        return aShapeUnderMouse;
-    }
-
-    private Canvas maCanvas;
-    private javax.swing.JTree maTree;
-}
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/canvas/ShapeContainer.java b/accessibility/workben/org/openoffice/accessibility/awb/canvas/ShapeContainer.java
deleted file mode 100644
index 03ad4bf..0000000
--- a/accessibility/workben/org/openoffice/accessibility/awb/canvas/ShapeContainer.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-package org.openoffice.accessibility.awb.canvas;
-
-import java.awt.Rectangle;
-import java.util.Iterator;
-import javax.swing.event.TreeModelListener;
-import javax.swing.event.TreeExpansionListener;
-import javax.swing.event.TreeWillExpandListener;
-import javax.swing.event.TreeExpansionEvent;
-import javax.swing.event.TreeModelEvent;
-import javax.swing.tree.TreeNode;
-
-import com.sun.star.accessibility.XAccessibleEventBroadcaster;
-
-/** Each canvas has a shape container that is responsible for maintaining
-    a collection of shapes that are displayed by the canvas.
-*/
-public class ShapeContainer
-    implements TreeModelListener,
-               TreeExpansionListener,
-               TreeWillExpandListener
-{
-    public ShapeContainer (Canvas aCanvas)
-    {
-        maShapeList = new java.util.Hashtable();
-        maBoundingBox = new Rectangle (0,0,100,100);
-        maCanvas = aCanvas;
-        maTree = null;
-    }
-
-
-
-
-    public synchronized void SetTree (javax.swing.JTree aTree)
-    {
-        if (aTree != maTree)
-        {
-            if (maTree != null)
-            {
-                maTree.getModel().removeTreeModelListener (this);
-                maTree.removeTreeExpansionListener (this);
-                maTree.removeTreeWillExpandListener (this);
-            }
-
-            Clear();
-
-            maTree = aTree;
-
-            maTree.getModel().addTreeModelListener (this);
-            maTree.addTreeExpansionListener (this);
-            maTree.addTreeWillExpandListener (this);
-        }
-    }
-
-
-
-
-    public synchronized boolean AddNode (TreeNode aNode)
-    {
-        CanvasShape aShape = (CanvasShape)maShapeList.get (aNode);
-        if (aShape == null)
-        {
-            aShape = new CanvasShape (aNode, maCanvas);
-
-                        if (aNode instanceof XAccessibleEventBroadcaster)
-                           ((XAccessibleEventBroadcaster) aNode).addEventListener(aShape);
-
-            // Update bounding box that includes all objects.
-           if (maShapeList.size() == 0)
-               maBoundingBox = aShape.GetBBox();
-           else
-               maBoundingBox = maBoundingBox.union (aShape.GetBBox());
-
-            maShapeList.put (aNode, aShape);
-
-            maCanvas.repaint();
-
-            return true;
-        }
-        else
-            return false;
-    }
-
-
-    /**
-    */
-    public synchronized boolean RemoveNode (TreeNode aNode)
-    {
-        CanvasShape aShape = (CanvasShape)maShapeList.get (aNode);
-        if (aShape != null)
-        {
-                        if (aNode instanceof XAccessibleEventBroadcaster)
-                           ((XAccessibleEventBroadcaster) aNode).removeEventListener(aShape);
-
-            maShapeList.remove (aNode);
-            maCanvas.SelectObject (null);
-            maCanvas.repaint ();
-            return true;
-        }
-        else
-            return false;
-    }
-
-
-
-
-    public synchronized void Clear ()
-    {
-        maShapeList.clear ();
-    }
-
-
-
-
-    public Iterator GetIterator ()
-    {
-        return maShapeList.values().iterator ();
-    }
-
-
-
-
-    public CanvasShape Get (TreeNode aNode)
-    {
-            if (aNode != null) {
-        return (CanvasShape)maShapeList.get (aNode);
-            }
-            return null;
-    }
-
-
-    private void PrintMessage (String aMessage, java.util.EventObject aEvent)
-    {
-        //        System.out.println ("ShapeContainer: " + aMessage + ": " + aEvent);
-    }
-
-    public void treeNodesChanged (TreeModelEvent aEvent)
-    {
-        PrintMessage ("treeNodesChanged", aEvent);
-    }
-    public void treeNodesInserted (TreeModelEvent aEvent)
-    {
-        PrintMessage ("treeNodesInserted", aEvent);
-        Object[] aNewNodes = aEvent.getChildren();
-        for (int i=0; i<aNewNodes.length; i++)
-            AddNode ((TreeNode)aNewNodes[i]);
-    }
-    public void treeNodesRemoved (TreeModelEvent aEvent)
-    {
-        PrintMessage ("treeNodesRemoved", aEvent);
-        Object[] aOldNodes = aEvent.getChildren();
-        for (int i=0; i<aOldNodes.length; i++)
-            RemoveNode ((TreeNode)aOldNodes[i]);
-    }
-    public void treeStructureChanged (TreeModelEvent aEvent)
-    {
-        PrintMessage ("treeStructureChanged", aEvent);
-        TreeNode aNode = (TreeNode)aEvent.getTreePath().getLastPathComponent();
-        RemoveAllChildren(aNode);
-        AddAllChildren(aNode);
-    }
-
-    public void treeWillExpand (TreeExpansionEvent aEvent)
-    {
-        PrintMessage ("treeWillExpand", aEvent);
-    }
-    public void treeWillCollapse (TreeExpansionEvent aEvent)
-    {
-        PrintMessage ("treeWillCollapse", aEvent);
-        TreeNode aNode = (TreeNode)aEvent.getPath().getLastPathComponent();
-        RemoveAllChildren (aNode);
-    }
-    public void treeExpanded (TreeExpansionEvent aEvent)
-    {
-        PrintMessage ("treeExpanded", aEvent);
-        TreeNode aNode = (TreeNode)aEvent.getPath().getLastPathComponent();
-        AddAllChildren (aNode);
-    }
-    public void treeCollapsed (TreeExpansionEvent aEvent)
-    {
-        PrintMessage ("treeCollapsed", aEvent);
-    }
-
-    private void AddAllChildren (TreeNode aNode) {
-        java.util.Enumeration aChildList = aNode.children();
-        while (aChildList.hasMoreElements()) {
-            TreeNode aChild = (TreeNode) aChildList.nextElement();
-            if (aChild != null) {
-                AddAllChildren (aChild);
-                AddNode (aChild);
-            }
-        }
-    }
-
-    private void RemoveAllChildren (TreeNode aNode) {
-        java.util.Enumeration aChildList = aNode.children();
-        while (aChildList.hasMoreElements()) {
-            TreeNode aChild = (TreeNode) aChildList.nextElement();
-            if (aChild != null) {
-                RemoveAllChildren (aChild);
-                RemoveNode (aChild);
-            }
-        }
-    }
-
-
-    private java.util.Hashtable maShapeList;
-    private Rectangle maBoundingBox;
-    private Canvas maCanvas;
-    private javax.swing.JTree maTree;
-}
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/canvas/makefile.common b/accessibility/workben/org/openoffice/accessibility/awb/canvas/makefile.common
deleted file mode 100644
index df47f1b..0000000
--- a/accessibility/workben/org/openoffice/accessibility/awb/canvas/makefile.common
+++ /dev/null
@@ -1,34 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-JARFILES = jurt.jar unoil.jar ridl.jar 
-JAVAFILES = 		\
-	CanvasShape.java  	\
-	Canvas.java        	\
-	MouseObserver.java	\
-	ShapeContainer.java
-
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/canvas/makefile.mk b/accessibility/workben/org/openoffice/accessibility/awb/canvas/makefile.mk
deleted file mode 100644
index d2feccf..0000000
--- a/accessibility/workben/org/openoffice/accessibility/awb/canvas/makefile.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJNAME	= awb
-PRJ		= ..$/..$/..$/..$/..$/..
-TARGET	= awb_canvas
-PACKAGE	= org$/openoffice$/accessibility$/awb$/canvas
-
-USE_JAVAVER:=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-.IF "$(JAVAVER:s/.//)" >= "140" 
-.INCLUDE : makefile.common
-JAVACLASSFILES= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-JARCLASSDIRS            = $(PACKAGE) org/openoffice/java/accessibility/awb 
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/makefile.common b/accessibility/workben/org/openoffice/accessibility/awb/makefile.common
deleted file mode 100644
index 0bf38a0..0000000
--- a/accessibility/workben/org/openoffice/accessibility/awb/makefile.common
+++ /dev/null
@@ -1,30 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-JAVAFILES = 						\
-	AccessibilityWorkBench.java		\
-	HelpWindow.java						
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/makefile.mk b/accessibility/workben/org/openoffice/accessibility/awb/makefile.mk
deleted file mode 100644
index a07d631..0000000
--- a/accessibility/workben/org/openoffice/accessibility/awb/makefile.mk
+++ /dev/null
@@ -1,57 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJNAME	= awb
-PRJ		= ..$/..$/..$/..$/..
-TARGET	= java_awb
-PACKAGE	= org$/openoffice$/accessibility$/awb
-
-USE_JAVAVER:=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-.IF "$(JAVAVER:s/.//)" >= "140" 
-JARFILES = jurt.jar unoil.jar ridl.jar 
-
-.INCLUDE : makefile.common
-
-JAVACLASSFILES= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-JARTARGET               = $(TARGET).jar
-JARCOMPRESS             = TRUE
-JARCLASSDIRS            = $(PACKAGE) \
-    org$/openoffice$/accessibility$/misc
-CUSTOMMANIFESTFILE      = manifest
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-
-.INCLUDE :  target.mk
-
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/manifest b/accessibility/workben/org/openoffice/accessibility/awb/manifest
deleted file mode 100644
index 36111c5..0000000
--- a/accessibility/workben/org/openoffice/accessibility/awb/manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Main-Class: org.openoffice.accessibility.awb.AccessibilityWorkBench
-Class-Path: classes.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar xt.jar jaxp.jar
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/tree/AccessibilityModel.java b/accessibility/workben/org/openoffice/accessibility/awb/tree/AccessibilityModel.java
deleted file mode 100644
index 1594677..0000000
--- a/accessibility/workben/org/openoffice/accessibility/awb/tree/AccessibilityModel.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-package org.openoffice.accessibility.awb.tree;
-
-import javax.swing.SwingUtilities;
-import javax.swing.tree.TreeNode;
-import javax.swing.tree.MutableTreeNode;
-import javax.swing.tree.DefaultMutableTreeNode;
-
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.awt.XExtendedToolkit;
-import com.sun.star.awt.XTopWindow;
-import com.sun.star.awt.XTopWindowListener;
-import com.sun.star.accessibility.AccessibleRole;
-import com.sun.star.accessibility.XAccessible;
-import com.sun.star.accessibility.XAccessibleContext;
-import com.sun.star.accessibility.XAccessibleEventBroadcaster;
-import com.sun.star.accessibility.XAccessibleEventListener;
-
-/**
- *
- */
-public abstract class AccessibilityModel extends javax.swing.tree.DefaultTreeModel {
-
-    protected java.util.Hashtable nodeList;
-    protected static DefaultMutableTreeNode disconnectedRootNode =
-        new DefaultMutableTreeNode("<not connected>");
-
-    /** Creates a new instance of AccessibilityModel */
-    public AccessibilityModel() {
-        super(disconnectedRootNode, false);
-        nodeList = new java.util.Hashtable();
-    }
-
-    /* Convenience method that creates a new Toolkit node from xToolkit
-     * and sets as the new root object of the tree.
-     */
-    public synchronized void setRoot(XExtendedToolkit xToolkit) {
-        if (xToolkit != null) {
-            try {
-                // remove old root node as topwindow listener
-                if (getRoot() instanceof ToolkitNode) {
-                    ToolkitNode tn = (ToolkitNode) getRoot();
-                    if (tn.xToolkit != null) {
-                        tn.xToolkit.removeTopWindowListener(tn);
-                    }
-                }
-                nodeList.clear();
-                setRoot(new ToolkitNode(xToolkit, this));
-                xToolkit.addTopWindowListener((ToolkitNode) getRoot());
-            } catch (com.sun.star.uno.RuntimeException e) {
-                // FIXME: error message !
-            }
-        }
-    }
-
-    /* Appends the new child to parent's child list */
-    public void addNodeInto(MutableTreeNode newChild, MutableTreeNode parent) {
-        int index = parent.getChildCount();
-        if (newChild != null && newChild.getParent() == parent) {
-            index -= 1;
-        }
-        insertNodeInto(newChild, parent, index);
-    }
-
-    /** Adds listener to the listener chain of node */
-    public static void addEventListener(TreeNode node, XAccessibleEventListener listener) {
-        if (node instanceof AccessibilityNode) {
-            ((AccessibilityNode) node).addEventListener(listener);
-        }
-    }
-
-    /** Removes listener from the listener chain of node */
-    public static void removeEventListener(TreeNode node, XAccessibleEventListener listener) {
-        if (node instanceof AccessibilityNode) {
-            ((AccessibilityNode) node).removeEventListener(listener);
-        }
-    }
-
-    protected abstract AccessibilityNode createWindowNode(XAccessible xAccessible,
-            XAccessibleContext xAccessibleContext);
-    protected abstract AccessibilityNode createNode(XAccessible xAccessible);
-
-    /** Adds xAccessible,node to the internal hashtable */
-    public AccessibilityNode putNode(XAccessible xAccessible, AccessibilityNode node) {
-        if (xAccessible != null) {
-            String oid = UnoRuntime.generateOid(xAccessible);
-            java.lang.ref.WeakReference ref = (java.lang.ref.WeakReference)
-                nodeList.put(oid, new java.lang.ref.WeakReference(node));
-            if (ref != null) {
-                return (AccessibilityNode) ref.get();
-            }
-        }
-        return null;
-    }
-
-    /** Returns the AccessibilityNode for xAccessible */
-    public AccessibilityNode findNode(XAccessible xAccessible) {
-        if (xAccessible != null) {
-            String oid = UnoRuntime.generateOid(xAccessible);
-            java.lang.ref.WeakReference ref =
-                (java.lang.ref.WeakReference) nodeList.get(oid);
-            if (ref != null) {
-                return (AccessibilityNode) ref.get();
-            }
-        }
-        return null;
-    }
-
-    /** Removes the AccessibilityNode for xAccessible from the internal hashtable */
-    public AccessibilityNode removeNode(XAccessible xAccessible) {
-        if (xAccessible != null) {
-            String oid = UnoRuntime.generateOid(xAccessible);
-            java.lang.ref.WeakReference ref =
-                (java.lang.ref.WeakReference) nodeList.remove(oid);
-            if (ref != null) {
-                return (AccessibilityNode) ref.get();
-            }
-        }
-        return null;
-    }
-
-    public AccessibilityNode removeNode(Object o) {
-        if (o instanceof XAccessible) {
-            return removeNode((XAccessible) o);
-        }
-        return null;
-    }
-}
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/tree/AccessibilityNode.java b/accessibility/workben/org/openoffice/accessibility/awb/tree/AccessibilityNode.java
deleted file mode 100644
index 81a499a..0000000
--- a/accessibility/workben/org/openoffice/accessibility/awb/tree/AccessibilityNode.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-package org.openoffice.accessibility.awb.tree;
-
-import org.openoffice.accessibility.misc.AccessibleEventMulticaster;
-
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.SwingUtilities;
-
-import com.sun.star.accessibility.AccessibleEventId;
-import com.sun.star.accessibility.AccessibleEventObject;
-import com.sun.star.accessibility.XAccessible;
-import com.sun.star.accessibility.XAccessibleContext;
-import com.sun.star.accessibility.XAccessibleEventBroadcaster;
-import com.sun.star.accessibility.XAccessibleEventListener;
-
-import com.sun.star.uno.UnoRuntime;
-
-class AccessibilityNode extends DefaultMutableTreeNode implements XAccessible,
-        XAccessibleEventListener, XAccessibleEventBroadcaster {
-
-    protected AccessibilityModel treeModel;
-    protected XAccessibleContext unoAccessibleContext;
-
-    private XAccessibleEventListener listener;
-
-    public AccessibilityNode(AccessibilityModel treeModel) {
-        this.treeModel = treeModel;
-    }
-
-    protected void finalize() throws java.lang.Throwable {
-        if (userObject != null) {
-            treeModel.removeNode(userObject);
-        }
-    }
-
-    /** Sets the XAccessibleContext object of this node */
-    public void setAccessibleContext(XAccessibleContext xAccessibleContext) {
-        unoAccessibleContext = xAccessibleContext;
-    }
-
-    /** Returns the XAccessibleContext object of this node */
-    public XAccessibleContext getAccessibleContext() {
-        return unoAccessibleContext;
-    }
-
-    /** Attaches or Detaches the itself as listener to unoAccessibleContext */
-    protected void setAttached(boolean attach) {
-        XAccessibleContext xAccessibleContext = unoAccessibleContext;
-        if (xAccessibleContext != null) {
-            try {
-                XAccessibleEventBroadcaster xAccessibleEventBroadcaster =
-                    UnoRuntime.queryInterface( XAccessibleEventBroadcaster.class, xAccessibleContext );
-                if (xAccessibleEventBroadcaster != null) {
-                    if (attach) {
-                        xAccessibleEventBroadcaster.addEventListener(this);
-                    } else {
-                        xAccessibleEventBroadcaster.removeEventListener(this);
-                    }
-                }
-            } catch (com.sun.star.uno.RuntimeException e) {
-                // FIXME: error message !
-            }
-        }
-    }
-
-    public void disposing(com.sun.star.lang.EventObject eventObject) {
-        XAccessibleEventListener localListener = this.listener;
-        if (localListener != null) {
-            localListener.disposing(eventObject);
-        }
-
-        treeModel.removeNode(userObject);
-        userObject = null;
-        unoAccessibleContext = null;
-        // FIXME: mark the object as being disposed in the tree view !
-    }
-
-    protected void handleChildRemoved(XAccessible xAccessible) {
-        final AccessibilityNode node = treeModel.findNode(xAccessible);
-        if (node != null) {
-            SwingUtilities.invokeLater(new java.lang.Runnable() {
-                public void run() {
-                    treeModel.removeNodeFromParent(node);
-                }
-            });
-        }
-    }
-
-    protected void handleChildAdded(XAccessible xAccessible) {
-        final AccessibilityNode parent = this;
-        final AccessibilityNode node = treeModel.createNode(xAccessible);
-        if (node != null) {
-            SwingUtilities.invokeLater(new java.lang.Runnable() {
-                public void run() {
-                    try {
-                        XAccessibleContext xAC = node.getAccessibleContext();
-                        if (xAC != null) {
-                            treeModel.insertNodeInto(node, parent,
-                                xAC.getAccessibleIndexInParent());
-                        }
-                    } catch (com.sun.star.uno.RuntimeException e) {
-                        // FIXME: output
-                    }
-                }
-            });
-        }
-    }
-
-    public void notifyEvent(AccessibleEventObject accessibleEventObject) {
-        if (accessibleEventObject.EventId == AccessibleEventId.CHILD) {
-            XAccessible xAccessible = UnoRuntime.queryInterface( XAccessible.class, accessibleEventObject.OldValue );
-            if (xAccessible != null) {
-                handleChildRemoved(xAccessible);
-            }
-
-            xAccessible = UnoRuntime.queryInterface( XAccessible.class, accessibleEventObject.NewValue );
-            if (xAccessible != null) {
-                handleChildAdded(xAccessible);
-            }
-        }
-
-        XAccessibleEventListener localListener = this.listener;
-        if (localListener != null) {
-            localListener.notifyEvent(accessibleEventObject);
-        }
-    }
-
-    public synchronized void addEventListener(com.sun.star.accessibility.XAccessibleEventListener xAccessibleEventListener) {
-         listener = AccessibleEventMulticaster.add(listener, xAccessibleEventListener);
-    }
-
-    public synchronized void removeEventListener(com.sun.star.accessibility.XAccessibleEventListener xAccessibleEventListener) {
-        listener = AccessibleEventMulticaster.remove(listener, xAccessibleEventListener);
-    }
-}
-
-
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/tree/AccessibilityTree.java b/accessibility/workben/org/openoffice/accessibility/awb/tree/AccessibilityTree.java
deleted file mode 100644
index e485c99..0000000
--- a/accessibility/workben/org/openoffice/accessibility/awb/tree/AccessibilityTree.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-package org.openoffice.accessibility.awb.tree;
-
-import org.openoffice.accessibility.misc.NameProvider;
-
-import javax.swing.tree.DefaultTreeModel;
-import javax.swing.tree.DefaultMutableTreeNode;
-
-import com.sun.star.awt.XExtendedToolkit;
-import com.sun.star.accessibility.XAccessible;
-import com.sun.star.accessibility.XAccessibleContext;
-
-/**
- *
- */
-public class AccessibilityTree extends javax.swing.JTree {
-
-    /** Creates a new instance of AccessibilityTree */
-    public AccessibilityTree(javax.swing.tree.TreeModel model) {
-        super(model);
-        // always show handles to indicate expandable / collapsable
-        showsRootHandles = true;
-    }
-
-    public void setToolkit(XExtendedToolkit xToolkit) {
-        AccessibilityModel model = (AccessibilityModel) getModel();
-        if (model != null) {
-            // hide the root node when connected
-            setRootVisible(xToolkit == null);
-            // update the root node
-            model.setRoot(xToolkit);
-            model.reload();
-        }
-    }
-
-     public String convertValueToText(Object value, boolean selected,
-            boolean expanded, boolean leaf, int row, boolean hasFocus) {
-
-        if (value instanceof DefaultMutableTreeNode) {
-            DefaultMutableTreeNode node = (DefaultMutableTreeNode) value;
-
-            Object userObject = node.getUserObject();
-            if (userObject != null && userObject instanceof XAccessible) {
-                XAccessible xAccessible = (XAccessible) userObject;
-                try {
-                    XAccessibleContext xAC = xAccessible.getAccessibleContext();
-                    if (xAC != null) {
-                        String name = xAC.getAccessibleName();
-                        if (name.length() == 0) {
-                            name = new String ("<no name>");
-                        }
-                        value = name + " / " + NameProvider.getRoleName(xAC.getAccessibleRole());
-                    }
-                } catch (com.sun.star.uno.RuntimeException e) {
-                    value = "???";
-                }
-            }
-        }
-
-        return super.convertValueToText(value, selected, expanded, leaf, row, hasFocus);
-     }
-
-}
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/tree/AccessibilityTreeModel.java b/accessibility/workben/org/openoffice/accessibility/awb/tree/AccessibilityTreeModel.java
deleted file mode 100644
index 6069c8f..0000000
--- a/accessibility/workben/org/openoffice/accessibility/awb/tree/AccessibilityTreeModel.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-package org.openoffice.accessibility.awb.tree;
-
-import com.sun.star.accessibility.XAccessible;
-import com.sun.star.awt.XExtendedToolkit;
-import com.sun.star.lang.DisposedException;
-import com.sun.star.lang.IndexOutOfBoundsException;
-
-import org.openoffice.accessibility.misc.OfficeConnection;
-import org.openoffice.accessibility.awb.event.EventQueue;
-
-import javax.swing.tree.DefaultTreeModel;
-import javax.swing.tree.TreeNode;
-
-
-public class AccessibilityTreeModel
-    extends DefaultTreeModel
-{
-    public AccessibilityTreeModel ()
-    {
-        super (null);
-        setAsksAllowsChildren (false);
-
-        SetRootNode();
-    }
-
-
-
-    /** Release all resources.
-    */
-    synchronized public void Dispose ()
-    {
-        Clear ();
-    }
-
-
-
-    /** Calls to this method are dispatched to the given node but are
-        observed for exceptions.
-    */
-    synchronized public boolean isLeaf (Object aObject)
-    {
-        boolean bIsLeaf = true;
-
-        if (aObject != null)
-        {
-            AccessibilityNode aNode = (AccessibilityNode)aObject;
-            try
-            {
-                bIsLeaf = aNode.isLeaf();
-            }
-            catch (DisposedException aException)
-            {
-                System.out.println ("node is disposed. removing it");
-                /*                TreeNode aParent = aNode.GetParent();
-                int nIndexInParent = aParent.getIndex (aNode);
-                aNode.removeFromParent ();
-                System.out.println ("" + aParent + " # " + aNode + " # "+ nIndexInParent);
-                nodesWereRemoved (
-                    aParent, new int[]{nIndexInParent}, new
-                    Object[]{aNode});
-                */
-            }
-            catch (Exception aException)
-            {
-                System.err.println ("caught exception in AccessibilityTreeModel.isLeaf():"
-                    + aException);
-                aException.printStackTrace (System.err);
-            }
-        }
-
-        return bIsLeaf;
-    }
-
-
-
-
-    synchronized public int getChildCount (Object aObject)
-    {
-        AccessibilityNode aNode = (AccessibilityNode)aObject;
-        return aNode.getChildCount();
-    }
-
-
-
-
-    /** Return the requested child of aParent.  If that child is not yet
-        known to the parent then try to create it.
-    */
-    synchronized public Object getChild (Object aParent, final int nIndex)
-    {

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list