This commit was manufactured by cvs2svn to create tag 'AccProbe_0_4_4'.
diff --git a/plugins/org.eclipse.actf.mediator/.classpath b/plugins/org.eclipse.actf.mediator/.classpath
deleted file mode 100644
index 304e861..0000000
--- a/plugins/org.eclipse.actf.mediator/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.actf.mediator/.cvsignore b/plugins/org.eclipse.actf.mediator/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/plugins/org.eclipse.actf.mediator/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/plugins/org.eclipse.actf.mediator/.project b/plugins/org.eclipse.actf.mediator/.project
deleted file mode 100644
index 985e1cd..0000000
--- a/plugins/org.eclipse.actf.mediator/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.actf.mediator</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.actf.mediator/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.actf.mediator/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 3da6d11..0000000
--- a/plugins/org.eclipse.actf.mediator/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Tue Jan 06 15:29:22 JST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/plugins/org.eclipse.actf.mediator/META-INF/MANIFEST.MF b/plugins/org.eclipse.actf.mediator/META-INF/MANIFEST.MF
deleted file mode 100644
index 897f8ce..0000000
--- a/plugins/org.eclipse.actf.mediator/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,14 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: ACTF Mediator Plug-in
-Bundle-SymbolicName: org.eclipse.actf.mediator
-Bundle-Version: 0.7.1.qualifier
-Bundle-Vendor: Eclipse.org
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.ui,
- org.eclipse.ui.views,
- org.eclipse.actf.core;visibility:=reexport,
- org.eclipse.actf.model.ui;visibility:=reexport,
- org.eclipse.actf.ui
-Export-Package: org.eclipse.actf.mediator
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.actf.mediator/about.html b/plugins/org.eclipse.actf.mediator/about.html
deleted file mode 100644
index 481dbcf..0000000
--- a/plugins/org.eclipse.actf.mediator/about.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June 5, 2006</p>	
-<h3>License</h3>
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  
-Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor&rsquo;s license 
-that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.mediator/build.properties b/plugins/org.eclipse.actf.mediator/build.properties
deleted file mode 100644
index 17daa5b..0000000
--- a/plugins/org.eclipse.actf.mediator/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               about.html
diff --git a/plugins/org.eclipse.actf.mediator/src/org/eclipse/actf/mediator/IACTFReport.java b/plugins/org.eclipse.actf.mediator/src/org/eclipse/actf/mediator/IACTFReport.java
deleted file mode 100644
index 49ca9ee..0000000
--- a/plugins/org.eclipse.actf.mediator/src/org/eclipse/actf/mediator/IACTFReport.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Kentarou FUKUDA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.mediator;
-
-/**
- * The interface used by ACTF report generators ({@link IACTFReportGenerator})
- * to encapsulate a report.
- * 
- */
-public interface IACTFReport {
-
-}
diff --git a/plugins/org.eclipse.actf.mediator/src/org/eclipse/actf/mediator/IACTFReportGenerator.java b/plugins/org.eclipse.actf.mediator/src/org/eclipse/actf/mediator/IACTFReportGenerator.java
deleted file mode 100644
index 4ded26a..0000000
--- a/plugins/org.eclipse.actf.mediator/src/org/eclipse/actf/mediator/IACTFReportGenerator.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Kentarou FUKUDA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.mediator;
-
-import org.eclipse.ui.IViewPart;
-
-/**
- * The interface for report generators in ACTF. The implementation of the
- * IACTFReportGenerator will receive the status change in ACTF as a
- * MediatorEvent. When users activate the implementation of this interface, it
- * will automatically informed to other ACTF components as a MediatorEvent.
- * 
- */
-public interface IACTFReportGenerator extends IViewPart, IMediatorEventListener {
-
-}
diff --git a/plugins/org.eclipse.actf.mediator/src/org/eclipse/actf/mediator/IACTFReportViewer.java b/plugins/org.eclipse.actf.mediator/src/org/eclipse/actf/mediator/IACTFReportViewer.java
deleted file mode 100644
index 5d712ad..0000000
--- a/plugins/org.eclipse.actf.mediator/src/org/eclipse/actf/mediator/IACTFReportViewer.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Kentarou FUKUDA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.mediator;
-
-import org.eclipse.ui.IViewPart;
-
-/**
- * The interface for report viewers in ACTF. The implementation of the
- * IACTFReportViewer will receive the status change in ACTF as a MediatorEvent.
- * 
- */
-public interface IACTFReportViewer extends IViewPart, IMediatorEventListener {
-
-}
diff --git a/plugins/org.eclipse.actf.mediator/src/org/eclipse/actf/mediator/IMediatorEventListener.java b/plugins/org.eclipse.actf.mediator/src/org/eclipse/actf/mediator/IMediatorEventListener.java
deleted file mode 100644
index 5b4f40b..0000000
--- a/plugins/org.eclipse.actf.mediator/src/org/eclipse/actf/mediator/IMediatorEventListener.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Kentarou FUKUDA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.mediator;
-
-import java.util.EventListener;
-
-/**
- * This listener interface may be implemented in order to receive a
- * {@link MediatorEvent} notification when a {@link Mediator} detects a status
- * change in ACTF components.
- * 
- * @see Mediator#addMediatorEventListener(IMediatorEventListener)
- * @see Mediator#removeMediatorEventListener(IMediatorEventListener)
- * 
- */
-public interface IMediatorEventListener extends EventListener {
-
-	/**
-	 * This method is called when the report ({@link IACTFReport}) was
-	 * submitted to the {@link Mediator}
-	 * 
-	 * @param event
-	 *            The {@link MediatorEvent} contains information about the
-	 *            event.
-	 */
-	public abstract void reportChanged(MediatorEvent event);
-
-	/**
-	 * This method is called when a report generator ({@link IACTFReportGenerator})
-	 * was selected by user.
-	 * 
-	 * @param event
-	 *            The {@link MediatorEvent} contains information about the
-	 *            event.
-	 */
-	public abstract void reportGeneratorChanged(MediatorEvent event);
-
-	/**
-	 * This method is called when a model service was selected by user.
-	 * 
-	 * @param event
-	 *            The {@link MediatorEvent} contains information about the
-	 *            event.
-	 */
-	public abstract void modelserviceChanged(MediatorEvent event);
-
-	/**
-	 * This method is called when an input change event was occured in the
-	 * active model service.
-	 * 
-	 * @param event
-	 *            The {@link MediatorEvent} contains information about the
-	 *            event.
-	 */
-	public abstract void modelserviceInputChanged(MediatorEvent event);
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.mediator/src/org/eclipse/actf/mediator/Mediator.java b/plugins/org.eclipse.actf.mediator/src/org/eclipse/actf/mediator/Mediator.java
deleted file mode 100644
index 77b82ca..0000000
--- a/plugins/org.eclipse.actf.mediator/src/org/eclipse/actf/mediator/Mediator.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Kentarou FUKUDA - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.actf.mediator;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.actf.model.ui.IModelServiceHolder;
-import org.eclipse.actf.ui.util.AbstractPartListener;
-import org.eclipse.actf.ui.util.PlatformUIUtil;
-import org.eclipse.ui.IPageListener;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IViewReference;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchPartReference;
-import org.eclipse.ui.IWorkbenchWindow;
-
-/**
- * A <code>Mediator</code> manages components and dataflows in the ACTF by
- * collaborating with the Eclipse framework. If <code>Mediator</code> detects a
- * status change in ACTF components, it will send <code>MediatorEvent</code> to
- * ACTF components and other registered EventListeners.
- * 
- */
-public class Mediator {
-
-	private static Mediator instance = new Mediator();
-
-	private IACTFReportGenerator curRepoter;
-
-	private IModelServiceHolder currentModelServiceHolder;
-
-	// TODO model/vizview combination to store the result
-	private HashMap<IACTFReportGenerator, IACTFReport> reportMap = new HashMap<IACTFReportGenerator, IACTFReport>();
-
-	private HashSet<IWorkbenchPage> pageSet = new HashSet<IWorkbenchPage>();
-
-	private Set<IMediatorEventListener> mediatorEventLisnterSet = Collections
-			.synchronizedSet(new HashSet<IMediatorEventListener>());
-
-	/**
-	 * Gets Mediator instance.
-	 * 
-	 * @return Mediator
-	 */
-	public static Mediator getInstance() {
-		return instance;
-	}
-
-	private Mediator() {
-		init();
-	}
-
-	/**
-	 * Sets the report to Mediator. Other ACTF components will receive the
-	 * <code>MediatorEvent</code> (report changed).
-	 * 
-	 * @param generator
-	 *            generator of the report
-	 * @param report
-	 *            new report to set
-	 */
-	public void setReport(IACTFReportGenerator generator, IACTFReport report) {
-		reportMap.put(generator, report);
-		reportChanged(new MediatorEvent(this, currentModelServiceHolder,
-				generator, report));
-	}
-
-	/**
-	 * Gets current report submitted from the report generator.
-	 * 
-	 * @param generator
-	 *            target report generator
-	 * @return current report submitted from the report generator
-	 */
-	public IACTFReport getReport(IACTFReportGenerator generator) {
-		return getEvaluationResult(null, generator);
-	}
-
-	private IACTFReport getEvaluationResult(IModelServiceHolder holder,
-			IACTFReportGenerator reporter) {
-		if (reportMap.containsKey(reporter)) {
-			return reportMap.get(reporter);
-		}
-		return null;
-		// return (new EvaluationResultImpl());
-	}
-
-	private void initPage(IWorkbenchPage page) {
-		if (pageSet.add(page)) {
-			IViewReference[] views = page.getViewReferences();
-			IViewPart tmpViewPart;
-			for (int i = 0; i < views.length; i++) {
-				if ((tmpViewPart = views[i].getView(false)) != null) {
-					if (tmpViewPart instanceof IMediatorEventListener) {
-						addMediatorEventListener((IMediatorEventListener) tmpViewPart);
-					}
-				}
-			}
-
-			page.addPartListener(new AbstractPartListener() {
-
-				public void partActivated(IWorkbenchPartReference partRef) {
-					IWorkbenchPart part = partRef.getPart(false);
-					if (part instanceof IACTFReportGenerator
-							&& part != curRepoter) {
-						curRepoter = (IACTFReportGenerator) part;
-						reporterViewChanged(new MediatorEvent(Mediator.this,
-								currentModelServiceHolder, curRepoter,
-								getReport(curRepoter)));
-					}
-					if (part instanceof IModelServiceHolder
-							&& part != currentModelServiceHolder) {
-						currentModelServiceHolder = (IModelServiceHolder) part;
-						modelserviceChanged(new MediatorEvent(Mediator.this,
-								currentModelServiceHolder, curRepoter,
-								getReport(curRepoter)));
-					}
-				}
-
-				@Override
-				public void partClosed(IWorkbenchPartReference partRef) {
-					IWorkbenchPart part = partRef.getPart(false);
-					if (part instanceof IMediatorEventListener) {
-						removeMediatorEventListener((IMediatorEventListener) part);
-					}
-				}
-
-				@Override
-				public void partOpened(IWorkbenchPartReference partRef) {
-					IWorkbenchPart part = partRef.getPart(false);
-					if (part instanceof IACTFReportViewer) {
-						IACTFReportViewer viewer = (IACTFReportViewer) part;
-						if (currentModelServiceHolder != null) {
-							viewer.reportChanged(new MediatorEvent(
-									Mediator.this, currentModelServiceHolder,
-									curRepoter, getReport(curRepoter)));
-						}
-						addMediatorEventListener(viewer);
-					} else if (part instanceof IMediatorEventListener) {
-						addMediatorEventListener((IMediatorEventListener) part);
-					}
-				}
-
-				// TODO Call InputChanged when the target URL of the Editor
-				// changes
-				@Override
-				public void partInputChanged(IWorkbenchPartReference partRef) {
-					IWorkbenchPart part = partRef.getPart(false);
-					if (part instanceof IModelServiceHolder) {
-						currentModelServiceHolder = (IModelServiceHolder) part;
-						modelserviceInputChanged(new MediatorEvent(
-								Mediator.this, currentModelServiceHolder,
-								curRepoter, getReport(curRepoter)));
-					}
-				}
-
-			});
-
-		}
-	}
-
-	private void init() {
-		IWorkbenchWindow activeWindow = PlatformUIUtil.getActiveWindow();
-
-		activeWindow.addPageListener(new IPageListener() {
-
-			public void pageActivated(IWorkbenchPage page) {
-			}
-
-			public void pageClosed(IWorkbenchPage page) {
-				pageSet.remove(page);
-			}
-
-			public void pageOpened(IWorkbenchPage page) {
-				initPage(page);
-			}
-
-		});
-		IWorkbenchPage activePage = PlatformUIUtil.getActivePage();
-		if (activePage != null) {
-			initPage(activePage);
-		}
-
-	}
-
-	/**
-	 * Registers the <code>IMediatorEventListener</code> to the Mediator.
-	 * 
-	 * @param listener
-	 *            the listener to register
-	 */
-	public synchronized void addMediatorEventListener(
-			IMediatorEventListener listener) {
-		mediatorEventLisnterSet.add(listener);
-	}
-
-	/**
-	 * Removes the <code>IMediatorEventListener</code> from the Mediator.
-	 * 
-	 * @param listener
-	 *            the listener to remove
-	 * @return true if the listener is removed from the Mediator
-	 */
-	public synchronized boolean removeMediatorEventListener(
-			IMediatorEventListener listener) {
-		return mediatorEventLisnterSet.remove(listener);
-	}
-
-	private synchronized void modelserviceChanged(MediatorEvent event) {
-		for (IMediatorEventListener i : mediatorEventLisnterSet
-				.toArray(new IMediatorEventListener[mediatorEventLisnterSet
-						.size()])) {
-			i.modelserviceChanged(event);
-		}
-	}
-
-	private synchronized void modelserviceInputChanged(MediatorEvent event) {
-		for (IMediatorEventListener i : mediatorEventLisnterSet
-				.toArray(new IMediatorEventListener[mediatorEventLisnterSet
-						.size()])) {
-			i.modelserviceInputChanged(event);
-		}
-	}
-
-	private synchronized void reportChanged(MediatorEvent event) {
-		for (IMediatorEventListener i : mediatorEventLisnterSet
-				.toArray(new IMediatorEventListener[mediatorEventLisnterSet
-						.size()])) {
-			i.reportChanged(event);
-		}
-	}
-
-	private synchronized void reporterViewChanged(MediatorEvent event) {
-		for (IMediatorEventListener i : mediatorEventLisnterSet
-				.toArray(new IMediatorEventListener[mediatorEventLisnterSet
-						.size()])) {
-			i.reportGeneratorChanged(event);
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.actf.mediator/src/org/eclipse/actf/mediator/MediatorEvent.java b/plugins/org.eclipse.actf.mediator/src/org/eclipse/actf/mediator/MediatorEvent.java
deleted file mode 100644
index 56ddbfa..0000000
--- a/plugins/org.eclipse.actf.mediator/src/org/eclipse/actf/mediator/MediatorEvent.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Kentarou FUKUDA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.mediator;
-
-import java.util.EventObject;
-
-import org.eclipse.actf.model.ui.IModelServiceHolder;
-
-/**
- * A <code>MediatorEvent</code> is sent by a {@link Mediator} to
- * {@link IMediatorEventListener}s when the <code>Mediator</code>
- * detects a status change in ACTF components. This notification typically 
- * occurs when the user activates an ACTF Model Service (usually Editor that
- * implements <code>IModelService</code>) or an ACTF Reporter Views 
- * (implements <code>IACTFReporterView</code> that generates an ACTF Report).
- * This event is also notified when the report 
- * (implements <code>IACTFReport</code>) was changed.
- * 
- */
-public class MediatorEvent extends EventObject {
-
-	private static final long serialVersionUID = -6308860434213716554L;
-
-	private IModelServiceHolder modelServiceHolder;
-	private IACTFReportGenerator view;
-	private IACTFReport report;
-		
-	MediatorEvent(Mediator source, IModelServiceHolder modelServiceHolder, IACTFReportGenerator view, IACTFReport report) {
-		super(source);
-		this.modelServiceHolder = modelServiceHolder;
-		this.view = view;
-		this.report = report;
-	}
-
-	/**
-	 * Returns the ModelServiceHolder that is related to this event.
-	 * 
-	 * @return the <code>IModelServiceHolder</code> related to this event
-	 */
-	public IModelServiceHolder getModelServiceHolder() {
-		return modelServiceHolder;
-	}
-
-	/**
-	 * Returns the ACTFReportGenerator that is related to this event.
-	 * 
-	 * @return the <code>IACTFReportGenerator</code> related to this event
-	 */
-	public IACTFReportGenerator getView() {
-		return view;
-	}
-
-	/**
-	 * Returns the ACTFReport that is related to this event.
-	 * 
-	 * @return the <code>IACTFReport</code> related to this event
-	 */
-	public IACTFReport getReport() {
-		return report;
-	}	
-
-}
diff --git a/plugins/org.eclipse.actf.mediator/src/org/eclipse/actf/mediator/package-info.java b/plugins/org.eclipse.actf.mediator/src/org/eclipse/actf/mediator/package-info.java
deleted file mode 100644
index f44e5f5..0000000
--- a/plugins/org.eclipse.actf.mediator/src/org/eclipse/actf/mediator/package-info.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Kentarou FUKUDA - initial API and implementation
- *******************************************************************************/
-
-/**
- * This package contains Mediator that manages components and dataflows in the ACTF by
- * collaborating with the Eclipse framework. 
- */
-package org.eclipse.actf.mediator;
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom.flash/.classpath b/plugins/org.eclipse.actf.model.dom.dombycom.flash/.classpath
deleted file mode 100644
index 304e861..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom.flash/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom.flash/.project b/plugins/org.eclipse.actf.model.dom.dombycom.flash/.project
deleted file mode 100644
index 5424f41..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom.flash/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.actf.model.dom.dombycom.flash</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom.flash/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.actf.model.dom.dombycom.flash/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index e5fd7da..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom.flash/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Tue Jan 06 15:29:46 JST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom.flash/META-INF/MANIFEST.MF b/plugins/org.eclipse.actf.model.dom.dombycom.flash/META-INF/MANIFEST.MF
deleted file mode 100644
index 89884d2..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom.flash/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: ACTF DomByCom Flash Fragment (Incubation)
-Bundle-SymbolicName: org.eclipse.actf.model.dom.dombycom.flash;singleton:=true
-Bundle-Version: 0.7.1.qualifier
-Bundle-Vendor: Eclipse.org
-Fragment-Host: org.eclipse.actf.model.dom.dombycom;bundle-version="0.0.1"
-Require-Bundle: org.eclipse.actf.model.flash,
- org.eclipse.actf.util.win32
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom.flash/about.html b/plugins/org.eclipse.actf.model.dom.dombycom.flash/about.html
deleted file mode 100644
index 481dbcf..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom.flash/about.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June 5, 2006</p>	
-<h3>License</h3>
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  
-Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor&rsquo;s license 
-that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom.flash/build.properties b/plugins/org.eclipse.actf.model.dom.dombycom.flash/build.properties
deleted file mode 100644
index f9681e7..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom.flash/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               about.html,\
-               fragment.xml
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom.flash/fragment.xml b/plugins/org.eclipse.actf.model.dom.dombycom.flash/fragment.xml
deleted file mode 100644
index 8cc0191..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom.flash/fragment.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<fragment>
-   <extension
-         point="org.eclipse.actf.model.dom.dombycom.elementFactory">
-      <objectElementFactory
-            implementations="org.eclipse.actf.model.dom.dombycom.impl.flash.FlashElementFactory">
-      </objectElementFactory>
-   </extension>
-
-</fragment>
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom.flash/src/org/eclipse/actf/model/dom/dombycom/impl/flash/FlashElementFactory.java b/plugins/org.eclipse.actf.model.dom.dombycom.flash/src/org/eclipse/actf/model/dom/dombycom/impl/flash/FlashElementFactory.java
deleted file mode 100644
index ec03bc6..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom.flash/src/org/eclipse/actf/model/dom/dombycom/impl/flash/FlashElementFactory.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Daisuke SATO - initial API and implementation
- *    Kentarou FUKUDA - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.actf.model.dom.dombycom.impl.flash;
-
-import org.eclipse.actf.model.dom.dombycom.IObjectElementFactory;
-import org.eclipse.actf.model.dom.dombycom.impl.NodeImpl;
-import org.eclipse.actf.util.win32.comclutch.IDispatch;
-
-public class FlashElementFactory implements IObjectElementFactory {
-
-	public FlashElementFactory() {
-	}
-	
-	public NodeImpl createTopNode(NodeImpl base, IDispatch inode) {
-		return FlashTopNodeImpl.newFlashNode(base, inode);
-	}
-}
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom.flash/src/org/eclipse/actf/model/dom/dombycom/impl/flash/FlashMSAANodeImpl.java b/plugins/org.eclipse.actf.model.dom.dombycom.flash/src/org/eclipse/actf/model/dom/dombycom/impl/flash/FlashMSAANodeImpl.java
deleted file mode 100644
index ef087f1..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom.flash/src/org/eclipse/actf/model/dom/dombycom/impl/flash/FlashMSAANodeImpl.java
+++ /dev/null
@@ -1,377 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Daisuke SATO - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.actf.model.dom.dombycom.impl.flash;
-
-import java.util.ArrayList;
-
-import org.eclipse.actf.model.dom.dombycom.IFlashMSAANode;
-import org.eclipse.actf.model.dom.dombycom.INodeEx;
-import org.eclipse.actf.model.dom.dombycom.impl.Helper;
-import org.eclipse.actf.model.dom.dombycom.impl.NodeImpl;
-import org.eclipse.actf.model.dom.dombycom.impl.html.ElementImpl;
-import org.eclipse.actf.model.flash.util.FlashMSAAUtil;
-import org.eclipse.actf.util.vocab.AbstractTerms;
-import org.eclipse.actf.util.win32.FlashMSAAObject;
-import org.eclipse.actf.util.win32.FlashMSAAObjectFactory;
-import org.eclipse.actf.util.win32.comclutch.IDispatch;
-import org.eclipse.actf.util.win32.comclutch.IUnknown;
-import org.eclipse.actf.util.win32.msaa.MSAA;
-import org.eclipse.swt.graphics.Rectangle;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-@SuppressWarnings("nls")
-public class FlashMSAANodeImpl extends ElementImpl implements IFlashMSAANode {
-	public String getID() {
-		return aObject.getAccKeyboardShortcut();
-	}
-
-	@Override
-	public int hashCode() {
-		String id = this.getID();
-		if (id == null)
-			return super.hashCode();
-		return id.hashCode();
-	}
-
-	@Override
-	public boolean equals(Object o) {
-		if (!(o instanceof IFlashMSAANode))
-			return super.equals(o);
-		IFlashMSAANode msaa = (IFlashMSAANode) o;
-		String id1 = this.getID();
-		String id2 = msaa.getID();
-		if (id1 == null || id2 == null)
-			return super.equals(o);
-		return id1.equals(id2);
-	}
-
-	FlashMSAAObject aObject;
-
-	private final boolean isTop;
-
-	private final FlashMSAANodeImpl topNode;
-
-	protected ElementImpl base;
-
-	private NodeImpl parent;
-
-	private int number;
-
-	private FlashMSAANodeImpl(ElementImpl impl, IDispatch inode,
-			FlashMSAAObject aObject) {
-		super(impl, inode);
-		this.base = impl;
-		this.parent = null;
-		this.aObject = searchFlash(aObject);
-		this.topNode = this;
-		this.isTop = true;
-	}
-
-	private FlashMSAAObject searchFlash(FlashMSAAObject top) {
-		try {
-			return searchFlash(top, 100);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-
-	private FlashMSAAObject searchFlash(FlashMSAAObject top, int n) {
-		if (top == null)
-			return null;
-		FlashMSAAObject[] children = top.getChildren();
-		// System.out.println(children.length);
-		for (int i = 0; i < children.length; i++) {
-			if (children[i] == null)
-				continue;
-			if (FlashMSAAUtil.isFlash(children[i])) {
-				IDispatch htmlElem = FlashMSAAUtil
-						.getHtmlElementFromObject(children[i]);
-
-				if (htmlElem != null) {
-					String targetUniqueID = (String) Helper.get(htmlElem,
-							"uniqueID");
-					String myUniqueID = base.getUniqueID();
-					if (myUniqueID.equals(targetUniqueID)) {
-						return children[i];
-					}
-				}
-			}
-		}
-		for (int i = 0; i < children.length; i++) {
-			if (n > 0) {
-				FlashMSAAObject iacc = searchFlash(children[i], n - 1);
-				if (iacc != null)
-					return iacc;
-			}
-		}
-		return null;
-	}
-
-	private FlashMSAANodeImpl(ElementImpl msaaBase, NodeImpl parent,
-			FlashMSAANodeImpl topNode, FlashMSAAObject aObject) {
-		super(msaaBase, null);
-		this.base = msaaBase;
-		this.aObject = aObject;
-		this.parent = parent;
-		this.topNode = topNode;
-		this.isTop = false;
-	}
-
-	public static FlashMSAANodeImpl newMSAANode(ElementImpl impl,
-			IDispatch inode) {
-		FlashMSAAObject iacc = FlashMSAAObjectFactory
-				.getFlashMSAAObjectFromElement(inode);
-
-		if (iacc != null) {
-			FlashMSAANodeImpl ret = new FlashMSAANodeImpl(impl, inode, iacc);
-			if (ret.aObject == null)
-				return null;
-			return ret;
-		}
-
-		return null;
-	}
-
-	public static long getHWNDFromObject(IUnknown unknown) {
-		FlashMSAAObject iacc = FlashMSAAObjectFactory
-				.getFlashMSAAObjectFromElement(unknown);
-
-		if (iacc == null)
-			return 0;
-
-		return iacc.getWindow();
-	}
-
-	@Override
-	public Node getParentNode() {
-		if (parent == null)
-			return super.getParentNode();
-		return parent;
-	}
-
-	public static class NodeListImpl implements NodeList {
-		ArrayList<Node> list;
-
-		FlashMSAANodeImpl parent;
-
-		private boolean showOffscreen = true;
-
-		private NodeListImpl(FlashMSAAObject[] aObjects,
-				FlashMSAANodeImpl parent, boolean isTop, int total) {
-			this.parent = parent;
-			list = new ArrayList<Node>();
-			for (int i = 0; i < aObjects.length; i++) {
-				if (aObjects[i] != null) {
-					int accState = aObjects[i].getAccState();
-					FlashMSAANodeImpl node = null;
-					if (0 == (accState & MSAA.STATE_INVISIBLE)) {
-						node = new FlashMSAANodeImpl(parent.base, parent,
-								parent.topNode, aObjects[i]);
-					} else if (showOffscreen
-							&& 0 != (accState & MSAA.STATE_OFFSCREEN)) {
-						node = new FlashMSAANodeImpl(parent.base, parent,
-								parent.topNode, aObjects[i]);
-					}
-					if (node != null) {
-						node.number = total++;
-						list.add(node);
-					}
-				}
-			}
-		}
-
-		public int getLength() {
-			return list.size();
-		}
-
-		public Node item(int index) {
-			return list.get(index);
-		}
-
-	}
-
-	@Override
-	public String getLinkURI() {
-		return "";
-	}
-
-	@Override
-	public boolean doClick() {
-		return aObject.doDefaultAction();
-	}
-
-	@Override
-	public NodeList getChildNodes() {
-		if (aObject == null) {
-			return new NodeListImpl(new FlashMSAAObject[0], this, isTop, 0);
-		}
-		return new NodeListImpl(aObject.getChildren(), this, isTop, 0);
-	}
-
-	@Override
-	public boolean hasChildNodes() {
-		if (aObject == null)
-			return false;
-		return aObject.getChildCount() > 0;
-	}
-
-	@Override
-	public Node getFirstChild() {
-		NodeList list = new NodeListImpl(aObject.getChildren(), this, isTop, 0);
-		if (list.getLength() > 0)
-			return list.item(0);
-		return null;
-	}
-
-	@Override
-	public Node getLastChild() {
-		NodeList list = new NodeListImpl(aObject.getChildren(), this, isTop, 0);
-		if (list.getLength() > 0)
-			return list.item(list.getLength() - 1);
-		return null;
-	}
-
-	@Override
-	public Node getNextSibling() {
-		return null;
-	}
-
-	@Override
-	public String extractString() {
-		if (aObject == null)
-			return "";
-
-		int r = aObject.getAccRole();
-		String accName = aObject.getAccName();
-		if (accName == null)
-			accName = "";
-
-		if (r == MSAA.ROLE_SYSTEM_PUSHBUTTON) {
-			if (accName.length() == 0) {
-				accName = "" + number;
-			}
-		}
-		if (accName.length() > 0)
-			return accName;
-		return accName;
-	}
-
-	@Override
-	public String getTagName() {
-		return super.getTagName();
-	}
-
-	@Override
-	public boolean highlight() {
-		aObject.select(MSAA.SELFLAG_TAKEFOCUS);
-		return true;
-	}
-
-	@Override
-	public boolean setFocus() {
-		if (aObject == null)
-			return false;
-		aObject.select(MSAA.SELFLAG_TAKEFOCUS);
-		return true;
-	}
-
-	@Override
-	public boolean unhighlight() {
-		if (aObject == null)
-			return false;
-		aObject.select(MSAA.SELFLAG_REMOVESELECTION);
-		return true;
-	}
-
-	@Override
-	public String getText() {
-		return "";
-	}
-
-	@Override
-	public String getNodeName() {
-		if (aObject == null)
-			return "";
-		// String id = aObject.getAccKeyboardShortcut();
-		// System.out.println("ID = " + id);
-		//
-		String role = MSAA.getRoleText(aObject.getAccRole());
-		String accName = aObject.getAccName();
-		if (accName == null)
-			accName = "";
-		// return aObject.getAccLocation() + "(" + role + ")" + accName;
-		return "(" + role + ")" + accName;
-	}
-
-	@Override
-	public Node getPreviousSibling() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public short getNodeType() {
-		// return FLASH_NODE;
-		return Node.ELEMENT_NODE;
-	}
-
-	@Override
-	public String getAttribute(String name) {
-		return "";
-	}
-
-	public long getWindow() {
-		return aObject.getWindow();
-	}
-
-	@Override
-	public AbstractTerms getTerms() {
-		return FlashMSAATerms.getInstance();
-	}
-
-	private IFlashMSAANode searchByIDInternal(String id) {
-		String target = aObject.getAccKeyboardShortcut();
-		if (id.equals(target))
-			return this;
-		NodeList nl = getChildNodes();
-		int len = nl.getLength();
-		for (int i = 0; i < len; i++) {
-			FlashMSAANodeImpl n = (FlashMSAANodeImpl) nl.item(i);
-			IFlashMSAANode ret = n.searchByIDInternal(id);
-			if (ret != null)
-				return ret;
-		}
-		return null;
-	}
-
-	public IFlashMSAANode searchByID(String id) {
-		return topNode.searchByIDInternal(id);
-	}
-
-	public INodeEx getBaseNode() {
-		return base;
-	}
-
-	@Override
-	public short getHeadingLevel() {
-		if (isTop)
-			return super.getHeadingLevel();
-		return 0;
-	}
-
-	@Override
-	public Rectangle getLocation() {
-		return base.getLocation();
-	}
-}
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom.flash/src/org/eclipse/actf/model/dom/dombycom/impl/flash/FlashMSAATerms.java b/plugins/org.eclipse.actf.model.dom.dombycom.flash/src/org/eclipse/actf/model/dom/dombycom/impl/flash/FlashMSAATerms.java
deleted file mode 100644
index dd4f33d..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom.flash/src/org/eclipse/actf/model/dom/dombycom/impl/flash/FlashMSAATerms.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Daisuke SATO - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.actf.model.dom.dombycom.impl.flash;
-
-import org.eclipse.actf.util.vocab.AbstractTerms;
-import org.eclipse.actf.util.vocab.IEvalTarget;
-import org.eclipse.actf.util.win32.msaa.MSAA;
-
-
-
-public class FlashMSAATerms extends AbstractTerms {
-    private static FlashMSAATerms instance;
-
-    public static FlashMSAATerms getInstance() {
-        if (instance == null) {
-            instance = new FlashMSAATerms();
-        }
-        return instance;
-    }
-
-    @Override
-    public boolean isClickable(IEvalTarget target) {
-        if (target instanceof FlashMSAANodeImpl) {
-            FlashMSAANodeImpl node = (FlashMSAANodeImpl) target;
-
-            int role = node.aObject.getAccRole();
-
-            return role == MSAA.ROLE_SYSTEM_PUSHBUTTON || role == MSAA.ROLE_SYSTEM_RADIOBUTTON
-                    || role == MSAA.ROLE_SYSTEM_CHECKBUTTON || role == MSAA.ROLE_SYSTEM_LINK;
-        }
-        return false;
-    }
-
-    @Override
-    public boolean isEmbeddedObject(IEvalTarget target) {
-        return false;
-    }
-
-    @Override
-    public boolean isInputable(IEvalTarget target) {
-        if (target instanceof FlashMSAANodeImpl) {
-            FlashMSAANodeImpl node = (FlashMSAANodeImpl) target;
-            
-            int role = node.aObject.getAccRole();
-            int state = node.aObject.getAccState();
-
-            return role == MSAA.ROLE_SYSTEM_TEXT && state != MSAA.STATE_READONLY;
-        }
-        return false;
-    }
-
-    @Override
-    public boolean isValidNode(IEvalTarget target) {
-        return true;
-    }
-
-    @Override
-    public boolean isVisibleNode(IEvalTarget target) {
-        return true;
-    }
-
-    @Override
-    public boolean isButton(IEvalTarget target) {
-        if (target instanceof FlashMSAANodeImpl) {
-            FlashMSAANodeImpl node = (FlashMSAANodeImpl) target;
-
-            int role = node.aObject.getAccRole();
-            
-            return role == MSAA.ROLE_SYSTEM_PUSHBUTTON;
-        }
-
-        return false;
-    }
-
-    @Override
-    public boolean isAlterable(IEvalTarget target) {
-        if (!(target instanceof FlashMSAANodeImpl)) return false;
-        if (!isClickable(target)) return false;
-        FlashMSAANodeImpl mn = (FlashMSAANodeImpl) target;
-        String id = mn.getID();
-        if (id == null) return false;
-        if (id.length() == 0) return false;
-        return true;
-    }
-}
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom.flash/src/org/eclipse/actf/model/dom/dombycom/impl/flash/FlashNodeImpl.java b/plugins/org.eclipse.actf.model.dom.dombycom.flash/src/org/eclipse/actf/model/dom/dombycom/impl/flash/FlashNodeImpl.java
deleted file mode 100644
index 382c57c..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom.flash/src/org/eclipse/actf/model/dom/dombycom/impl/flash/FlashNodeImpl.java
+++ /dev/null
@@ -1,534 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Hisashi MIYASHITA - initial API and implementation
- *    Kentarou FUKUDA - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.actf.model.dom.dombycom.impl.flash;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-
-import org.eclipse.actf.model.dom.dombycom.AnalyzedResult;
-import org.eclipse.actf.model.dom.dombycom.IFlashMSAANode;
-import org.eclipse.actf.model.dom.dombycom.IFlashNode;
-import org.eclipse.actf.model.dom.dombycom.INodeEx;
-import org.eclipse.actf.model.dom.dombycom.impl.DocumentImpl;
-import org.eclipse.actf.model.flash.ASAccInfo;
-import org.eclipse.actf.model.flash.IASBridge;
-import org.eclipse.actf.model.flash.IASNode;
-import org.eclipse.actf.model.flash.IFlashConst;
-import org.eclipse.actf.util.dom.EmptyNodeListImpl;
-import org.eclipse.actf.util.vocab.AbstractTerms;
-import org.eclipse.actf.util.win32.comclutch.ComPlugin;
-import org.eclipse.actf.util.win32.keyhook.ISendEvent;
-import org.eclipse.swt.graphics.Rectangle;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.UserDataHandler;
-
-@SuppressWarnings("nls")
-class FlashNodeImpl implements IFlashNode, IFlashConst {
-	// final ASObject nodeASObj;
-	private final ASAccInfo accInfo;
-	private final String target;
-	private final IFlashNode parent;
-	private final boolean hasChildren;
-	private FlashTopNodeImpl swf;
-	private DocumentImpl doc;
-
-	private final IASNode flashNode;
-	private final IASBridge flashPlayer;
-
-	@Override
-	public int hashCode() {
-		return this.target.intern().hashCode();
-	}
-
-	@Override
-	public boolean equals(Object o) {
-		if (o instanceof FlashNodeImpl) {
-			FlashNodeImpl f = (FlashNodeImpl) o;
-			return swf.equals(f.swf) && this.target.equals(f.target);
-		}
-		return false;
-	}
-
-	private FlashNodeImpl(IASNode node, IFlashNode parent) {
-		this.flashNode = node;
-		this.flashPlayer = node.getPlayer();
-		this.target = node.getTarget();
-		this.accInfo = node.getAccInfo();
-		if (node.isOpaqueObject()) {
-			this.hasChildren = false;
-		} else {
-			this.hasChildren = true;
-		}
-		this.parent = parent;
-	}
-
-	FlashNodeImpl(FlashNodeImpl baseNode, IASNode node) {
-		this(node, baseNode);
-		this.swf = baseNode.swf;
-		this.doc = baseNode.doc;
-	}
-
-	FlashNodeImpl(FlashTopNodeImpl baseNode, IASNode node) {
-		this(node, baseNode);
-		this.swf = baseNode;
-		this.doc = (DocumentImpl) baseNode.getOwnerDocument();
-	}
-
-	private Object getProperty(String prop) {
-		return flashPlayer.getProperty(getTarget(), prop);
-	}
-
-	private void setProperty(String prop, Object value) {
-		flashPlayer.setProperty(getTarget(), prop, value);
-	}
-
-	private static ISendEvent sendEvent;
-
-	private ISendEvent getSendEvent() {
-		if (sendEvent == null) {
-			sendEvent = ComPlugin.getDefault().newSendEvent();
-		}
-		return sendEvent;
-	}
-
-	public String getNodeName() {
-		return "#flashNode:" + getTarget();
-	}
-
-	public String getNodeValue() throws DOMException {
-		return null;
-	}
-
-	public void setNodeValue(String nodeValue) throws DOMException {
-		throw new UnsupportedOperationException();
-	}
-
-	public short getNodeType() {
-		// return FLASH_NODE;
-		return Node.ELEMENT_NODE;
-	}
-
-	public Node getParentNode() {
-		return parent;
-	}
-
-	private static class NodeListImpl implements NodeList {
-		private final IFlashNode[] nodes;
-
-		public Node item(int index) {
-			if ((index < 0) || (index >= nodes.length))
-				return null;
-			return nodes[index];
-		}
-
-		public int getLength() {
-			return nodes.length;
-		}
-
-		NodeListImpl(IFlashNode[] nodes) {
-			this.nodes = nodes;
-		}
-	}
-
-	public NodeList getChildNodes() {
-		if (!hasChildren)
-			return EmptyNodeListImpl.getInstance();
-		IFlashNode[] r = getSWFChildNodes();
-		return new NodeListImpl(r);
-	}
-
-	public Node getFirstChild() {
-		if (!hasChildren)
-			return null;
-		IFlashNode[] r = getSWFChildNodes();
-		if (r == null)
-			return null;
-		if (r.length == 0)
-			return null;
-		return r[0];
-	}
-
-	public Node getLastChild() {
-		if (!hasChildren)
-			return null;
-		IFlashNode[] r = getSWFChildNodes();
-		if (r == null)
-			return null;
-		if (r.length == 0)
-			return null;
-		return r[r.length - 1];
-	}
-
-	public Node getPreviousSibling() {
-		throw new UnsupportedOperationException();
-	}
-
-	public Node getNextSibling() {
-		throw new UnsupportedOperationException();
-	}
-
-	public NamedNodeMap getAttributes() {
-		return null;
-	}
-
-	public Document getOwnerDocument() {
-		return doc;
-	}
-
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		throw new UnsupportedOperationException();
-	}
-
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		throw new UnsupportedOperationException();
-	}
-
-	public Node removeChild(Node oldChild) throws DOMException {
-		throw new UnsupportedOperationException();
-	}
-
-	public Node appendChild(Node newChild) throws DOMException {
-		throw new UnsupportedOperationException();
-	}
-
-	public boolean hasChildNodes() {
-		// IFlashNode[] r = getInnerNodes();
-		if (!hasChildren)
-			return false;
-		IFlashNode[] r = getSWFChildNodes();
-		if (r == null)
-			return false;
-		if (r.length == 0)
-			return false;
-		return true;
-	}
-
-	public Node cloneNode(boolean deep) {
-		throw new UnsupportedOperationException();
-	}
-
-	public void normalize() {
-	}
-
-	public boolean isSupported(String feature, String version) {
-		return false;
-	}
-
-	public String getNamespaceURI() {
-		return null;
-	}
-
-	public String getPrefix() {
-		return null;
-	}
-
-	public void setPrefix(String prefix) throws DOMException {
-		throw new UnsupportedOperationException();
-	}
-
-	public String getLocalName() {
-		String target = getTarget();
-		int idx = target.lastIndexOf('.');
-		if (idx < 0)
-			return target;
-		return target.substring(idx + 1);
-	}
-
-	public boolean hasAttributes() {
-		return false;
-	}
-
-	public String getBaseURI() {
-		return null;
-	}
-
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return 0;
-	}
-
-	public String getTextContent() throws DOMException {
-		return extractString();
-	}
-
-	public void setTextContent(String textContent) throws DOMException {
-		throw new UnsupportedOperationException();
-	}
-
-	public boolean isSameNode(Node other) {
-		return false;
-	}
-
-	public String lookupPrefix(String namespaceURI) {
-		return null;
-	}
-
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return false;
-	}
-
-	public String lookupNamespaceURI(String prefix) {
-		return null;
-	}
-
-	public boolean isEqualNode(Node arg) {
-		return false;
-	}
-
-	public Object getFeature(String feature, String version) {
-		return null;
-	}
-
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		throw new UnsupportedOperationException();
-	}
-
-	public Object getUserData(String key) {
-		throw new UnsupportedOperationException();
-	}
-
-	// --------------------------------------------------------------------------------
-	// INodeEx interface
-	// --------------------------------------------------------------------------------
-
-	@SuppressWarnings("unused")
-	private String decodeString(String input) {
-		if (input == null)
-			return "";
-		try {
-			return URLDecoder.decode(input, "UTF-8");
-		} catch (UnsupportedEncodingException e) {
-		}
-		return input;
-	}
-
-	public String extractString() {
-		String r = null;
-		if (null != accInfo) {
-			r = accInfo.getName();
-		}
-		if (r == null) {
-			r = flashNode.getText(false);
-		}
-		if (r == null)
-			return "";
-		// return decodeString(r);
-		return r;
-	}
-
-	public short getHeadingLevel() {
-		return 0;
-	}
-
-	public String getLinkURI() {
-		// TODO
-		return null;
-	}
-
-	public void setText(String text) {
-		setProperty(ASNODE_TEXT, text);
-	}
-
-	public String getText() {
-		Object o = getProperty(ASNODE_TEXT);
-		if (o instanceof String)
-			return (String) o;
-		return "";
-	}
-
-	private boolean doHardwareClick() {
-		long hwnd = swf.getHWND();
-		int ix = (int) flashNode.getX();
-		int iy = (int) flashNode.getY();
-		int iw = (int) flashNode.getWidth();
-		int ih = (int) flashNode.getHeight();
-		int x = ix + iw / 4;
-		int y = iy + ih / 4;
-
-		// System.err.println("Click to:" + x + "," + y);
-
-		// getSendEvent().postMouse(x, y, false);
-		getSendEvent().focusWindow(hwnd);
-		setFocus();
-		getSendEvent().postMouse(x, y, false);
-		boolean result = getSendEvent().postMouse(x, y, true);
-		return result;
-	}
-
-	String getClickableTarget(String current) {
-		while (current.length() > 0) {
-			String tryOnRelease = current + PATH_ON_RELEASE;
-			if (swf.getNodeFromPath(tryOnRelease) != null) {
-				return current;
-			}
-			String tryOnPress = current + PATH_ON_PRESS;
-			if (swf.getNodeFromPath(tryOnPress) != null) {
-				return current;
-			}
-			int idx = current.lastIndexOf('.');
-			if (idx <= 0)
-				break;
-			current = current.substring(0, idx);
-		}
-		return null;
-	}
-
-	public boolean doClick() {
-		String current = getTarget();
-		while (current.length() > 0) {
-			String tryOnRelease = current + PATH_ON_RELEASE;
-			if (swf.getNodeFromPath(tryOnRelease) != null) {
-				flashPlayer.callMethod(flashNode, M_ON_RELEASE);
-				return true;
-			}
-			String tryOnPress = current + PATH_ON_PRESS;
-			if (swf.getNodeFromPath(tryOnPress) != null) {
-				flashPlayer.callMethod(flashNode, M_ON_PRESS);
-				return true;
-			}
-			if (true)
-				break;
-			int idx = current.lastIndexOf('.');
-			if (idx <= 0)
-				break;
-			current = current.substring(0, idx);
-		}
-		if (doHardwareClick())
-			return true;
-		return false;
-	}
-
-	public boolean highlight() {
-		flashPlayer.callMethod(flashNode, M_ON_ROLL_OVER);
-		boolean ret1 = swf.highlight();
-		boolean ret2 = flashNode.setMarker();
-		return ret1 && ret2;
-	}
-
-	public boolean unhighlight() {
-		flashPlayer.callMethod(flashNode, M_ON_ROLL_OUT);
-		boolean ret1 = swf.unhighlight();
-		boolean ret2 = flashPlayer.unsetMarker();
-		return ret1 && ret2;
-	}
-
-	public boolean setFocus() {
-		if (!swf.setFocus())
-			return false;
-		return flashPlayer.setFocus(getTarget());
-	}
-
-	public int getNth() {
-		// TODO!
-		return 0;
-	}
-
-	// --------------------------------------------------------------------------------
-	// IFlashNode interface
-	// --------------------------------------------------------------------------------
-
-	public String getTarget() {
-		return target;
-	}
-
-	public IFlashNode getNodeFromPath(String path) {
-		return swf.getNodeFromPath(path);
-	}
-
-	public IFlashNode getNodeAtDepth(int depth) {
-		IASNode result = flashPlayer.getNodeAtDepthWithPath(getTarget(), depth);
-		if (result == null)
-			return null;
-		return new FlashNodeImpl(swf, result);
-	}
-
-	private IFlashNode[] createIFlashNodeArray(IASNode[] nodes) {
-		IFlashNode[] results = new IFlashNode[nodes.length];
-		for (int i = 0; i < nodes.length; i++) {
-			results[i] = new FlashNodeImpl(this, nodes[i]);
-		}
-		return results;
-	}
-
-	public IFlashNode[] getInnerNodes() {
-		return createIFlashNodeArray(flashNode.getChildren(true));
-	}
-
-	public IFlashNode[] getSWFChildNodes() {
-		return createIFlashNodeArray(flashNode.getChildren(false));
-	}
-
-	public int getDepth() {
-		return flashNode.getDepth();
-	}
-
-	public int getCurrentFrame() {
-		return flashNode.getCurrentFrame();
-	}
-
-	public IFlashNode[] translate() {
-		return createIFlashNodeArray(flashPlayer.translateWithPath(getTarget()));
-	}
-
-	public INodeEx getBaseNode() {
-		return swf;
-	}
-
-	// --------------------------------------------------------------------------------
-	// extensions.
-	// --------------------------------------------------------------------------------
-
-	boolean isInputable() {
-		return flashNode.isInputable();
-	}
-
-	boolean isSilent() {
-		return accInfo.isSilent();
-	}
-
-	public AnalyzedResult analyze(AnalyzedResult ar) {
-		return ar;
-	}
-
-	public AbstractTerms getTerms() {
-		return FlashTerms.getInstance();
-	}
-
-	public Rectangle getLocation() {
-		// TODO
-		return swf.getLocation();
-	}
-
-	// --------------------------------------------------------------------------------
-	// Dummy
-	// --------------------------------------------------------------------------------
-	public IFlashMSAANode getMSAA() {
-		return null;
-	}
-
-	public void repairFlash() {
-	}
-
-	// !FN!
-	public String[] getStillPictureData() {
-		return new String[3];
-	}
-
-	public char getAccessKey() {
-		return 0;
-	}
-
-}
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom.flash/src/org/eclipse/actf/model/dom/dombycom/impl/flash/FlashSoundImpl.java b/plugins/org.eclipse.actf.model.dom.dombycom.flash/src/org/eclipse/actf/model/dom/dombycom/impl/flash/FlashSoundImpl.java
deleted file mode 100644
index c8d2cbb..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom.flash/src/org/eclipse/actf/model/dom/dombycom/impl/flash/FlashSoundImpl.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Hisashi MIYASHITA - initial API and implementation
- *    Kentarou FUKUDA - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.actf.model.dom.dombycom.impl.flash;
-
-import org.eclipse.actf.model.dom.dombycom.INodeExSound;
-import org.eclipse.actf.model.flash.IASBridge;
-import org.eclipse.actf.model.flash.IASNode;
-import org.eclipse.actf.model.flash.IFlashConst;
-
-class FlashSoundImpl implements INodeExSound, IFlashConst {
-
-	private int volBeforeMuted = -1;
-	private final IASBridge player;
-	private final IASNode target;
-
-	FlashSoundImpl(IASNode node) {
-		this.target = node;
-		this.player = node.getPlayer();
-	}
-
-	public boolean muteMedia(boolean flag) {
-		if (flag) {
-			if (volBeforeMuted < 0) {
-				volBeforeMuted = getVolume();
-				return setVolume(0);
-			}
-		} else {
-			if (volBeforeMuted >= 0) {
-				boolean success = setVolume(volBeforeMuted);
-				volBeforeMuted = -1;
-				return success;
-			}
-		}
-		return true;
-	}
-
-	public int getVolume() {
-		Object o = player.callMethod(target, M_GET_VOLUME);
-		if (o instanceof Double) {
-			return ((Double) o).intValue() * 10;
-		} else if (o instanceof Integer) {
-			return ((Integer) o).intValue() * 10;
-		}
-		return -1;
-	}
-
-	public boolean setVolume(int val) {
-		val = val / 10;
-		player.callMethod(target, M_SET_VOLUME, new Object[] { Integer
-				.valueOf(val) });
-		return true;
-	}
-
-	public boolean getMuteState() {
-		if (volBeforeMuted < 0)
-			return false;
-		return true;
-	}
-}
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom.flash/src/org/eclipse/actf/model/dom/dombycom/impl/flash/FlashTerms.java b/plugins/org.eclipse.actf.model.dom.dombycom.flash/src/org/eclipse/actf/model/dom/dombycom/impl/flash/FlashTerms.java
deleted file mode 100644
index ae667f9..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom.flash/src/org/eclipse/actf/model/dom/dombycom/impl/flash/FlashTerms.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Daisuke SATO - initial API and implementation
- *    Kentarou FUKUDA - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.actf.model.dom.dombycom.impl.flash;
-
-import org.eclipse.actf.model.dom.dombycom.impl.html.ElementImpl;
-import org.eclipse.actf.model.dom.dombycom.impl.html.HTMLTerms;
-import org.eclipse.actf.util.vocab.AbstractTerms;
-import org.eclipse.actf.util.vocab.IEvalTarget;
-import org.w3c.dom.Node;
-
-
-
-
-public class FlashTerms extends AbstractTerms {
-    @Override
-    public boolean isAlterable(IEvalTarget target) {
-        return isClickable(target);
-    }
-
-    private static FlashTerms instance;
-
-    public static FlashTerms getInstance() {
-        if (instance == null) {
-            instance = new FlashTerms();
-        }
-        return instance;
-    }
-
-    @Override
-    public boolean isValidNode(IEvalTarget target) {
-        return true;
-    }
-
-    @Override
-    public boolean isVisibleNode(IEvalTarget target) {
-        if (target instanceof FlashNodeImpl) {
-            FlashNodeImpl flash = (FlashNodeImpl) target;
-            return !(flash.isSilent());
-        }
-        return true;
-    }
-
-    @Override
-    public boolean isInputable(IEvalTarget target) {
-        if (target instanceof FlashNodeImpl) {
-            FlashNodeImpl flash = (FlashNodeImpl) target;
-            return flash.isInputable();
-        }
-        return false;
-    }
-
-    @Override
-    public boolean isClickable(IEvalTarget target) {
-        if (target instanceof FlashNodeImpl) {
-            FlashNodeImpl flash = (FlashNodeImpl) target;
-
-            String clickableTarget = flash.getClickableTarget(flash.getTarget());
-            if (clickableTarget != null)
-                return true;
-
-        }
-        return false;
-    }
-
-    @Override
-    public boolean isButton(IEvalTarget target) {
-        if (target instanceof FlashNodeImpl) {
-            FlashNodeImpl flash = (FlashNodeImpl) target;
-
-            String clickableTarget = flash.getClickableTarget(flash.getTarget());
-            if (clickableTarget != null)
-                return true;
-
-        }
-        return false;
-    }
-
-    @Override
-    public boolean isFlashTopNode(IEvalTarget target) {
-        if (target instanceof FlashTopNodeImpl)
-            return true;
-        return false;
-    }
-    
-    @Override
-    public boolean isMSAAFlash(IEvalTarget target) {
-        if (target instanceof FlashTopNodeImpl) {
-            return ((FlashTopNodeImpl) target).getMSAA() != null;
-        }
-        return false;
-    }
-
-    @Override
-    public boolean isEmbeddedObject(IEvalTarget target) {
-        if (target instanceof ElementImpl) {
-            ElementImpl element = (ElementImpl) target;
-
-            String name = element.getLocalName();
-            if ("EMBED".equals(name) || "OBJECT".equals(name)) //$NON-NLS-1$ //$NON-NLS-2$
-                return true;
-        }
-        return false;
-    }
-
-    @Override
-    public boolean isAccessKey(char key, IEvalTarget target) {
-        if (target instanceof FlashTopNodeImpl)
-            return HTMLTerms.getInstance().isAccessKey(key, target);
-        return super.isAccessKey(key, target);
-    }
-
-    @Override
-    public boolean isBlockJumpPointB(IEvalTarget target) {
-        if (target instanceof FlashTopNodeImpl)
-            return HTMLTerms.getInstance().isBlockJumpPointB(target);
-        return super.isBlockJumpPointB(target);
-    }
-
-    @Override
-    public boolean isBlockJumpPointF(IEvalTarget target) {
-        if (target instanceof FlashTopNodeImpl)
-            return HTMLTerms.getInstance().isBlockJumpPointF(target);
-        return super.isBlockJumpPointF(target);
-    }
-
-    @Override
-    public boolean isHeading(int level, IEvalTarget target) {
-        if (target instanceof FlashTopNodeImpl)
-            return HTMLTerms.getInstance().isHeading(level, target);
-        return super.isHeading(level, target);
-    }
-
-    @Override
-    public boolean isHeadingJumpPoint(IEvalTarget target) {
-        if (target instanceof FlashTopNodeImpl)
-            return HTMLTerms.getInstance().isHeadingJumpPoint(target);
-        return super.isHeadingJumpPoint(target);
-    }
-
-    @Override
-    public boolean nodeLocation(Node refNode, boolean backward, IEvalTarget target) {
-        if (target instanceof FlashTopNodeImpl)
-            return HTMLTerms.getInstance().nodeLocation(refNode, backward, target);
-        return super.nodeLocation(refNode, backward, target);
-    }
-
-    @Override
-    public boolean isMedia(IEvalTarget target) {
-        if (target instanceof FlashTopNodeImpl) {
-            FlashTopNodeImpl swf = (FlashTopNodeImpl) target;
-            return swf.hasMedia();
-        } else {
-            return super.isMedia(target);
-        }
-    }
-
-    @Override
-    public boolean hasContent(IEvalTarget target) {
-        if (isFlashTopNode(target)) return true;
-        if (isInputable(target)) return true;
-        if (isListTop(target)) return true;
-        return super.hasContent(target);
-    }
-}
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom.flash/src/org/eclipse/actf/model/dom/dombycom/impl/flash/FlashTopNodeImpl.java b/plugins/org.eclipse.actf.model.dom.dombycom.flash/src/org/eclipse/actf/model/dom/dombycom/impl/flash/FlashTopNodeImpl.java
deleted file mode 100644
index 65c456f..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom.flash/src/org/eclipse/actf/model/dom/dombycom/impl/flash/FlashTopNodeImpl.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Hisashi MIYASHITA - initial API and implementation
- *    Kentarou FUKUDA - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.actf.model.dom.dombycom.impl.flash;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.actf.model.dom.dombycom.AnalyzedResult;
-import org.eclipse.actf.model.dom.dombycom.IFlashMSAANode;
-import org.eclipse.actf.model.dom.dombycom.IFlashNode;
-import org.eclipse.actf.model.dom.dombycom.INodeEx;
-import org.eclipse.actf.model.dom.dombycom.INodeExSound;
-import org.eclipse.actf.model.dom.dombycom.INodeExVideo;
-import org.eclipse.actf.model.dom.dombycom.impl.Helper;
-import org.eclipse.actf.model.dom.dombycom.impl.ListNodeListImpl;
-import org.eclipse.actf.model.dom.dombycom.impl.NodeImpl;
-import org.eclipse.actf.model.dom.dombycom.impl.html.ElementImpl;
-import org.eclipse.actf.model.flash.FlashPlayerFactory;
-import org.eclipse.actf.model.flash.IASNode;
-import org.eclipse.actf.model.flash.IFlashConst;
-import org.eclipse.actf.model.flash.IFlashPlayer;
-import org.eclipse.actf.util.vocab.AbstractTerms;
-import org.eclipse.actf.util.win32.comclutch.IDispatch;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-@SuppressWarnings("nls")
-class FlashTopNodeImpl extends ElementImpl implements IFlashNode, IFlashConst {
-
-	private static final String CLSID = "CLSID:D27CDB6E-AE6D-11CF-96B8-444553540000";
-	private static final String APP_TYPE = "application/x-shockwave-flash";
-
-	private static final IFlashNode[] emptyResult = new IFlashNode[0];
-
-	private FlashMSAANodeImpl cachedMSAA;
-
-	private IFlashPlayer flashPlayer;
-
-	static FlashTopNodeImpl newFlashNode(NodeImpl baseNode, IDispatch inode) {
-		String clsid = (String) Helper.get(inode, "classid");
-		if (CLSID.equalsIgnoreCase(clsid)) {
-			return new FlashTopNodeImpl(baseNode, inode);
-		}
-		String type = (String) Helper.get((IDispatch) inode.invoke1(
-				"getAttributeNode", "type"), "value");
-		if (APP_TYPE.equalsIgnoreCase(type)) {
-			return new FlashTopNodeImpl(baseNode, inode);
-		}
-		return null;
-	}
-
-	private FlashTopNodeImpl(NodeImpl baseNode, IDispatch idisp) {
-		super(baseNode, idisp);
-
-		flashPlayer = FlashPlayerFactory.getPlayerFromIDsipatch(idisp);
-
-	}
-
-	private INodeExVideo[] searchVideo() {
-		IASNode[] videos = flashPlayer.searchVideo();
-		int len = videos.length;
-		INodeExVideo[] result = new INodeExVideo[len];
-		for (int i = 0; i < len; i++) {
-			// System.err.println("SVO:" + videos[i]);
-			result[i] = new FlashVideoImpl(this, videos[i]);
-		}
-		return result;
-	}
-
-	private INodeExSound[] searchSound() {
-		IASNode[] sounds = flashPlayer.searchSound();
-		int len = sounds.length;
-		INodeExSound[] result = new INodeExSound[len];
-		for (int i = 0; i < len; i++) {
-			result[i] = new FlashSoundImpl(sounds[i]);
-		}
-		return result;
-	}
-
-	public String getTarget() {
-		return "";
-	}
-
-	public IFlashNode getNodeFromPath(String path) {
-		IASNode node = flashPlayer.getNodeFromPath(path);
-		if (node == null)
-			return null;
-		return new FlashNodeImpl(this, node);
-	}
-
-	public IFlashNode getNodeAtDepth(int depth) {
-		return null;
-	}
-
-	public IFlashNode[] getInnerNodes() {
-		return emptyResult;
-	}
-
-	private IFlashNode[] createIFlashNodeArray(IASNode[] nodes) {
-		IFlashNode[] results = new IFlashNode[nodes.length];
-		for (int i = 0; i < nodes.length; i++) {
-			results[i] = new FlashNodeImpl(this, nodes[i]);
-		}
-		return results;
-	}
-
-	public IFlashNode[] translate() {
-		return createIFlashNodeArray(flashPlayer
-				.translateWithPath(PATH_ROOTLEVEL));
-	}
-
-	public int getDepth() {
-		return INVALID_DEPTH;
-	}
-
-	public int getCurrentFrame() {
-		return -1;
-	}
-
-	public INodeEx getBaseNode() {
-		return this;
-	}
-
-	// --------------------------------------------------------------------------------
-	// Node Overriding Impl.
-	// --------------------------------------------------------------------------------
-
-	@Override
-	public Node getFirstChild() {
-		// System.err.println("invalid(getFirstChild).");
-		return null;
-	}
-
-	@Override
-	public Node getLastChild() {
-		// System.err.println("invalid(getLastChild).");
-		return null;
-	}
-
-	@Override
-	public NodeList getChildNodes() {
-		List<Node> l = new ArrayList<Node>(3);
-		for (int i = 0; i < 3; i++) {
-			String levelxName = "_level" + i;
-			IFlashNode levelx = getNodeFromPath(levelxName);
-			if (levelx != null) {
-				// System.err.println(levelxName + " is found.");
-				l.add(levelx);
-			}
-		}
-
-		return new ListNodeListImpl(l);
-	}
-
-	private boolean hasMedia = false;
-
-	boolean hasMedia() {
-		return hasMedia;
-	}
-
-	@Override
-	public AnalyzedResult analyze(AnalyzedResult ar) {
-		INodeExVideo[] videos = searchVideo();
-		if (videos.length > 0) {
-			hasMedia = true;
-			for (int i = 0; i < videos.length; i++) {
-				ar.addVideo(videos[i]);
-			}
-		}
-		INodeExSound[] sounds = searchSound();
-		for (int i = 0; i < sounds.length; i++) {
-			ar.addSound(sounds[i]);
-		}
-		ar.addFlashTopNode(this);
-		return ar;
-	}
-
-	public void repairFlash() {
-		flashPlayer.repairFlash();
-	}
-
-	public IFlashMSAANode getMSAA() {
-		if (cachedMSAA == null)
-			cachedMSAA = FlashMSAANodeImpl.newMSAANode(this, inode);
-		if ((cachedMSAA == null) || (cachedMSAA.getWindow() == 0))
-			return null;
-		// repairFlash();
-		updateTarget();
-		return cachedMSAA;
-	}
-
-	public long getHWND() {
-		return FlashMSAANodeImpl.getHWNDFromObject(super.getINode());
-	}
-
-	@Override
-	public AbstractTerms getTerms() {
-		return FlashTerms.getInstance();
-	}
-
-	// TODO...
-	private boolean updatedTarget = false;
-
-	public void updateTarget() {
-		if (updatedTarget)
-			return;
-		updatedTarget = flashPlayer.updateTarget();
-	}
-}
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom.flash/src/org/eclipse/actf/model/dom/dombycom/impl/flash/FlashVideoImpl.java b/plugins/org.eclipse.actf.model.dom.dombycom.flash/src/org/eclipse/actf/model/dom/dombycom/impl/flash/FlashVideoImpl.java
deleted file mode 100644
index 00e347a..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom.flash/src/org/eclipse/actf/model/dom/dombycom/impl/flash/FlashVideoImpl.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Hisashi MIYASHITA - initial API and implementation
- *    Kentarou FUKUDA - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.actf.model.dom.dombycom.impl.flash;
-
-import org.eclipse.actf.model.dom.dombycom.INodeEx;
-import org.eclipse.actf.model.dom.dombycom.INodeExVideo;
-import org.eclipse.actf.model.flash.IASBridge;
-import org.eclipse.actf.model.flash.IASNode;
-import org.eclipse.actf.model.flash.IFlashConst;
-
-class FlashVideoImpl implements INodeExVideo, IFlashConst {
-	private final FlashTopNodeImpl swf;
-	private final IASNode target;
-	private final IASBridge player;
-	// Some sort of hacking solution!!!
-	private VideoState currentState = VideoState.STATE_UNKNOWN;
-
-	// public String getTarget() {
-	// return target.getTarget();
-	// }
-
-	FlashVideoImpl(FlashTopNodeImpl swf, IASNode node) {
-		this.swf = swf;
-		this.target = node;
-		this.player = node.getPlayer();
-	}
-
-	public boolean previousTrack() {
-		return false;
-	}
-
-	public boolean nextTrack() {
-		return false;
-	}
-
-	public boolean stopMedia() {
-		player.callMethod(target, M_STOP);
-		currentState = VideoState.STATE_STOP;
-		return true;
-	}
-
-	public boolean playMedia() {
-		player.callMethod(target, M_PLAY);
-		currentState = VideoState.STATE_PLAY;
-		return true;
-	}
-
-	public boolean pauseMedia() {
-		player.callMethod(target, M_PAUSE);
-		currentState = VideoState.STATE_PAUSE;
-		return true;
-	}
-
-	public boolean fastReverse() {
-		return false;
-	}
-
-	public boolean fastForward() {
-		return false;
-	}
-
-	public double getCurrentPosition() {
-		Object o = player.callMethod(target, M_GET_CURRENT_POSITION);
-		if (o instanceof Double) {
-			return ((Double) o).doubleValue();
-		} else if (o instanceof Float) {
-			return ((Float) o).floatValue();
-		} else if (o instanceof Integer) {
-			return ((Integer) o).intValue();
-		}
-		return 0;
-	}
-
-	public double getTotalLength() {
-		return -1;
-	}
-
-	public VideoState getCurrentState() {
-		// TODO
-		return currentState;
-	}
-
-	public INodeEx getReferenceNode() {
-		// Returns the top node (maybe a makeshift).
-		return swf;
-	}
-}
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom/.classpath b/plugins/org.eclipse.actf.model.dom.dombycom/.classpath
deleted file mode 100644
index 304e861..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom/.cvsignore b/plugins/org.eclipse.actf.model.dom.dombycom/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom/.project b/plugins/org.eclipse.actf.model.dom.dombycom/.project
deleted file mode 100644
index 5e56c10..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.actf.model.dom.dombycom</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.actf.model.dom.dombycom/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 312be97..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Tue Jan 06 15:29:35 JST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom/META-INF/MANIFEST.MF b/plugins/org.eclipse.actf.model.dom.dombycom/META-INF/MANIFEST.MF
deleted file mode 100644
index bd17ef4..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: ACTF DomByCom Plug-in (Incubation)
-Bundle-SymbolicName: org.eclipse.actf.model.dom.dombycom;singleton:=true
-Bundle-Version: 0.7.1.qualifier
-Bundle-Activator: org.eclipse.actf.model.dom.dombycom.DombycomPlugin
-Bundle-Vendor: Eclipse.org
-Require-Bundle: org.eclipse.swt,
- org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.actf.core,
- org.eclipse.actf.util.vocab,
- org.eclipse.actf.util.win32.comclutch
-Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.actf.model.dom.dombycom
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom/about.html b/plugins/org.eclipse.actf.model.dom.dombycom/about.html
deleted file mode 100644
index 481dbcf..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom/about.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June 5, 2006</p>	
-<h3>License</h3>
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  
-Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor&rsquo;s license 
-that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom/build.properties b/plugins/org.eclipse.actf.model.dom.dombycom/build.properties
deleted file mode 100644
index 9fd065b..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom/build.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = META-INF/,\
-               about.html,\
-               plugin.xml,\
-               .
-jars.compile.order = .
-source.. = src/
-output.. = bin/
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom/plugin.xml b/plugins/org.eclipse.actf.model.dom.dombycom/plugin.xml
deleted file mode 100644
index c43aa44..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom/plugin.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-   <extension-point id="elementFactory" name="elementFactory" schema="schema/elementFactory.exsd"/>
-
-</plugin>
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom/schema/elementFactory.exsd b/plugins/org.eclipse.actf.model.dom.dombycom/schema/elementFactory.exsd
deleted file mode 100644
index d9646c2..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom/schema/elementFactory.exsd
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.actf.model.dom.dombycom">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.actf.model.dom.dombycom" id="elementFactory" name="Element Factory"/>
-      </appInfo>
-      <documentation>
-         This extension point is used to add Element Factories to this (DOM by COM) plugin.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="objectElementFactory" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a fully qualified identifier of the target extension point
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  an optional identifier of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  an optional name of the extension instance
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="objectElementFactory">
-      <complexType>
-         <attribute name="implementations" type="string" use="required">
-            <annotation>
-               <documentation>
-                  the name of a class that implements &lt;samp&gt;org.eclipse.actf.model.dom.dombycom.IObjectElementFactory&lt;/samp&gt;.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.actf.model.dom.dombycom.IObjectElementFactory"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         The following is an example of an extension definition:
-&lt;pre&gt;
-   &lt;extension
-         point=&quot;org.eclipse.actf.model.dom.dombycom.elementFactory&quot;&gt;
-      &lt;objectElementFactory
-            implementations=&quot;org.eclipse.actf.model.dom.dombycom.impl.flash.FlashElementFactory&quot;&gt;
-      &lt;/objectElementFactory&gt;
-   &lt;/extension&gt;
-&lt;/pre&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         The contributor will add new Element factory for Object Elements by using &lt;samp&gt;objectElementFactory&lt;/samp&gt;. &lt;samp&gt;implementations&lt;/samp&gt; is required attribute for &lt;samp&gt;objectElementFactory&lt;/samp&gt;, and the specified class must implement &lt;samp&gt;org.eclipse.actf.model.dom.dombycom.IObjectElementFactory&lt;/samp&gt;.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         ACTF provides a &lt;samp&gt;FlashElementFactory&lt;/samp&gt;. It provides an Element implementation that enables to access Object Model of Flash content. Please see &lt;samp&gt;org.eclipse.actf.model.dom.dombycom.flash&lt;/samp&gt; plugin for more details. (If you include the plugin, the FlashElementFactory will be automatically registerd to this extension.)
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2008 IBM Corporation and others.&lt;br&gt;
-All rights reserved. This program and the accompanying materials are made
-available under the terms of the Eclipse Public License v1.0 which accompanies
-this distribution, and is available at &lt;a 
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/AnalyzedResult.java b/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/AnalyzedResult.java
deleted file mode 100644
index a5c07fa..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/AnalyzedResult.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Hisashi MIYASHITA - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.actf.model.dom.dombycom;
-
-import java.util.ArrayList;
-
-/**
- * AnalyzedResult is used as the object storage for DOM tree traversal.
- * Currently it will have video objects, sound objects, access key list, and
- * Flash nodes. You can collect those objects with
- * {@link INodeEx#analyze(AnalyzedResult)} method.
- */
-public class AnalyzedResult {
-	private static final INodeExVideo[] emptyVideoArray = new INodeExVideo[0];
-	private static final INodeExSound[] emptySoundArray = new INodeExSound[0];
-	private ArrayList<INodeExVideo> videoList = new ArrayList<INodeExVideo>();
-	private ArrayList<INodeExSound> soundList = new ArrayList<INodeExSound>();
-
-	private static final INodeEx[] emptyAccessKeyArray = new INodeEx[0];
-	private ArrayList<INodeEx> accessKeyList = new ArrayList<INodeEx>();
-
-	private static final IFlashNode[] emptyFlashTopNodeArray = new IFlashNode[0];
-	private ArrayList<IFlashNode> flashNodeList = new ArrayList<IFlashNode>();
-
-	/**
-	 * This method is used by items of tree.
-	 * @param f
-	 */
-	public void addFlashTopNode(IFlashNode f) {
-		flashNodeList.add(f);
-	}
-
-	/**
-	 * This method is used by items of tree.
-	 * @param v
-	 */
-	public void addVideo(INodeExVideo v) {
-		videoList.add(v);
-	}
-
-	/**
-	 * This method is used by items of tree.
-	 * @param s
-	 */
-	public void addSound(INodeExSound s) {
-		soundList.add(s);
-	}
-
-	/**
-	 * This method is used by items of tree.
-	 * @param a
-	 */
-	public void addAccessKey(INodeEx a) {
-		accessKeyList.add(a);
-	}
-
-	/**
-	 * @return video objects in the tree.
-	 */
-	public INodeExVideo[] getVideoNodes() {
-		return videoList.toArray(emptyVideoArray);
-	}
-
-	/**
-	 * @return sound objects in the tree.
-	 */
-	public INodeExSound[] getSoundNodes() {
-		return soundList.toArray(emptySoundArray);
-	}
-
-	/**
-	 * @return node objects that has one or more access keys in the tree. 
-	 */
-	public INodeEx[] getAccessKeyNodes() {
-		return accessKeyList.toArray(emptyAccessKeyArray);
-	}
-
-	/**
-	 * @return Flash objects. Each object is corresponding to a Flash object.
-	 */
-	public IFlashNode[] getFlashTopNodes() {
-		return flashNodeList.toArray(emptyFlashTopNodeArray);
-	}
-}
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/DomByCom.java b/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/DomByCom.java
deleted file mode 100644
index d80095b..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/DomByCom.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Hisashi MIYASHITA - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.actf.model.dom.dombycom;
-
-import org.eclipse.actf.model.dom.dombycom.impl.DocumentImpl;
-import org.eclipse.actf.model.dom.dombycom.impl.StyleSheetImpl;
-import org.eclipse.actf.util.win32.comclutch.ComPlugin;
-import org.eclipse.actf.util.win32.comclutch.ComService;
-import org.eclipse.actf.util.win32.comclutch.IDispatch;
-import org.eclipse.actf.util.win32.comclutch.ResourceManager;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-/**
- * DomByCom is a utility class to obtain the COM wrapper object form the pointer
- * of the web browser object.
- */
-public class DomByCom {
-	private ResourceManager resourceManager;
-
-	private final IDispatch iWebBrowser2;
-
-	/**
-	 * This id is used for div elements created by aiBrowser to show border line
-	 * of the focused object.
-	 */
-	public static final String ID_DIV = "__org_eclipse_actf_highlight_div__"; //$NON-NLS-1$
-
-	public static final int DIV_BORDER_WIDTH = 3;
-
-	public static final int STYLE_BORDER = 0;
-
-	public static final int DIV_BORDER = 1;
-
-	public static final int STYLE_BORDER2 = 2;
-
-	public static final int BORDER_MODE = STYLE_BORDER2;
-
-	public static final String BORDER_STYLE_STRING = "border: 3px solid #071; background: #fdd;"; //$NON-NLS-1$
-
-	private void addStyles(DocumentImpl doc) {
-		StyleSheetImpl style = doc.createStyleSheet();
-		if (style != null) {
-			style.addRule(".CSStoHighlight", BORDER_STYLE_STRING); //$NON-NLS-1$
-		}
-	}
-
-	@SuppressWarnings("nls")
-	private void addDivs(DocumentImpl doc) {
-		Element el = doc.getElementById(ID_DIV);
-		if (el == null) {
-			el = doc.createElement("div");
-			el.setAttribute("id", ID_DIV);
-
-			NodeList body = doc.getElementsByTagName("body");
-			if (body != null && body.getLength() > 0) {
-				System.out.println("insert");
-				body.item(0).appendChild(el);
-
-				try {
-					IElementEx elx = (IElementEx) el;
-					IStyle st = elx.getStyle();
-
-					st.put("position", "absolute");
-					st.put("backgroundColor", "transparent");
-					st.put("border", DIV_BORDER_WIDTH + "px solid green");
-					st.put("zIndex", "10000");
-					st.put("left", "-1000px");
-					st.put("top", "-1000px");
-					st.put("width", "100px");
-					st.put("height", "100px");
-				} catch (Exception e) {
-					e.printStackTrace();
-				}
-			}
-		}
-	}
-
-	private void initialize(DocumentImpl doc) {
-		if (BORDER_MODE == STYLE_BORDER) {
-			addStyles(doc);
-		} else if (BORDER_MODE == DIV_BORDER) {
-			addDivs(doc);
-		} else if (BORDER_MODE == STYLE_BORDER2) {
-			// do nothing;
-		}
-	}
-
-	/**
-	 * Release all objects managed by the DomByCom. DomByCom has a resource
-	 * manager which manages the life cycle of the objects obtained from the
-	 * document.
-	 */
-	public void release() {
-		resourceManager.releaseAll(iWebBrowser2);
-	}
-
-	/**
-	 * @return the document object of the web browser.
-	 */
-	public IDocumentEx getDocument() {
-		IDispatch iDocument = (IDispatch) iWebBrowser2.get("Document"); //$NON-NLS-1$
-		DocumentImpl doc = new DocumentImpl(iDocument);
-		initialize(doc);
-		return doc;
-	}
-
-	/**
-	 * DomByCom is a utility class to obtain the COM wrapper object form the
-	 * pointer of the web browser object.
-	 * 
-	 * @param iWebBrowser2
-	 *            the native pointer of the IWebBrowser2 object.
-	 */
-	public DomByCom(long iWebBrowser2) {
-		this.resourceManager = ComPlugin.getDefault().newResourceManager(null);
-		this.iWebBrowser2 = ComService.newIDispatch(resourceManager,
-				iWebBrowser2, true);
-	}
-}
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/DombycomPlugin.java b/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/DombycomPlugin.java
deleted file mode 100644
index 0e70fca..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/DombycomPlugin.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Hisashi MIYASHITA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.dombycom;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class DombycomPlugin extends Plugin {
-
-    //The shared instance.
-    private static DombycomPlugin plugin;
-	
-    /**
-     * The constructor.
-     */
-    public DombycomPlugin() {
-        plugin = this;
-    }
-
-    /**
-     * This method is called upon plug-in activation
-     */
-    @Override
-        public void start(BundleContext context) throws Exception {
-        super.start(context);
-		
-    }
-
-    /**
-     * This method is called when the plug-in is stopped
-     */
-    @Override
-        public void stop(BundleContext context) throws Exception {
-        super.stop(context);
-        plugin = null;
-    }
-
-    /**
-     * Returns the shared instance.
-     */
-    public static DombycomPlugin getDefault() {
-        return plugin;
-    }
-
-}
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/IDocumentEx.java b/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/IDocumentEx.java
deleted file mode 100644
index 3f42f94..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/IDocumentEx.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Hisashi MIYASHITA - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.actf.model.dom.dombycom;
-
-import java.util.List;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-/**
- * The extended interface of the {@link Document}.
- */
-public interface IDocumentEx extends Document {
-    /**
-     * CSS compatible mode (IE)
-     */
-    String CSS1_COMPAT = "CSS1Compat"; //$NON-NLS-1$
-    
-    /**
-     * Back compatible mode (IE)
-     */
-    String BACK_COMPAT = "BackCompat"; //$NON-NLS-1$
-    
-    /**
-     * getElementById will return a node, but actual content sometimes
-     * has more than one objects having save ID and it can't search in the
-     * document of iframes in the top document. 
-     * 
-     * @param id to be used for the search
-     * @return the objects which has <i>id</i> as its id attribute.
-     */
-    List<Node> getElementsByIdInAllFrames(String id);
-    
-    /**
-     * @return the CSS compatible mode (IE)
-     */
-    String getCompatMode();
-    
-    /**
-     * @param target the anchor name to be searched.
-     * @return the first element whose name is <i>target</i>.
-     */
-    Element getTargetElement(String target);
-}
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/IElementEx.java b/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/IElementEx.java
deleted file mode 100644
index b8ce3a5..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/IElementEx.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Daisuke SATO - initial API and implementation
- *    Kentarou FUKUDA - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.actf.model.dom.dombycom;
-
-import org.w3c.dom.Element;
-
-/**
- * The extended interface of the {@link Element}
- */
-public interface IElementEx extends Element, INodeEx{
-	/**
-	 * An instance of Position represents a nth position of a element in a radio
-	 * button group and list group.
-	 */
-	public class Position {
-		public int index;
-		public int total;
-	}
-
-	/**
-	 * @return the CSS style object.
-	 */
-	public IStyle getStyle();
-
-	/**
-	 * @return the position of the element in the radio group. This is valid if
-	 *         the element is a radio button in the radio group.
-	 */
-	public Position getRadioPosition();
-
-	/**
-	 * @return the position of the element in the list. This is valid if the
-	 *         element is an item of the list.
-	 */
-	public Position getListPosition();
-
-	/**
-	 * @return the label object annotating the element. This is valid if the
-	 *         element is a form element and a label element for the element is
-	 *         existing.
-	 */
-	public Element getFormLabel();
-
-	/** 
-	 * @return the attribute value originally specified to the element. If no value is specified, returns null.
-	 * @see org.w3c.dom.Element#getAttribute(java.lang.String)
-	 */
-	public String getAttribute(String name);
-	
-	/**
-	 * @return the attribute value currently assigned to the element. (same as getAttribute method of IE DOM)
-	 */
-	public String getCurrentAttribute(String name);
-}
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/IFlashMSAANode.java b/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/IFlashMSAANode.java
deleted file mode 100644
index d6dfcf4..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/IFlashMSAANode.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Hisashi MIYASHITA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.dombycom;
-
-/**
- * The IFlashMSAANode interface defines the methods to be implemented by the MSAA
- * object.
- */
-public interface IFlashMSAANode extends INodeEx {
-	/**
-	 * @return the unique ID of the node. A node should return an id.
-	 */
-	String getID();
-
-	/**
-	 * @param id the id to be used for the search
-	 * @return the MSAA node specified by the <i>id<i>.
-	 */
-	IFlashMSAANode searchByID(String id);
-
-	/**
-	 * @return the base node. It might be an object element of the Flash object.
-	 */
-	INodeEx getBaseNode();
-}
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/IFlashNode.java b/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/IFlashNode.java
deleted file mode 100644
index 69d865d..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/IFlashNode.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Hisashi MIYASHITA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.dombycom;
-
-/**
- * IFlashNode interface defines the methods to be implemented by the Flash node
- * objects. It extends the {@link INodeEx} interface for Flash object.
- */
-public interface IFlashNode extends INodeEx {
-	short FLASH_NODE = 120;
-
-	/**
-	 * @return the target path of the Flash object from the root. It might be
-	 *         like a "_level0.hoge.hoge".
-	 */
-	String getTarget();
-
-	/**
-	 * @param path the target path to be obtained.
-	 * @return the Flash object specified by the <i>path</i>
-	 */
-	IFlashNode getNodeFromPath(String path);
-
-	/**
-	 * @param depth the target depth to be obtained.
-	 * @return the Flash object specified by the <i>depth</i>
-	 */
-	IFlashNode getNodeAtDepth(int depth);
-
-	/**
-	 * @return the original child nodes of the Flash node.
-	 */
-	IFlashNode[] getInnerNodes();
-
-	/**
-	 * @return the depth of the node.
-	 */
-	int getDepth();
-
-	/**
-	 * @return the frame number of the current state.
-	 */
-	int getCurrentFrame();
-
-	/**
-	 * This method is used by the auto translate function.
-	 * @return the translated nodes.
-	 */
-	IFlashNode[] translate();
-
-	/**
-	 * @return the MSAA representation of the Flash element.
-	 */
-	IFlashMSAANode getMSAA();
-
-	/**
-	 * do the Flash repairing function. (experimental)
-	 */
-	void repairFlash();
-
-	/**
-	 * @return the root Flash object node.
-	 */
-	INodeEx getBaseNode();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/IImageElement.java b/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/IImageElement.java
deleted file mode 100644
index c5851ae..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/IImageElement.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Daisuke SATO - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.actf.model.dom.dombycom;
-
-import org.w3c.dom.Element;
-
-/**
- * The IImageElement interface defines the methods to be implemented by the
- * image element.
- */
-public interface IImageElement extends INodeEx {
-	/**
-	 * @return the map element specified in the image element as a attribute.
-	 */
-	public Element getMap();
-
-	/**
-	 * @return whether the element has usemap attribute or not.
-	 */
-	public boolean hasUsemap();
-}
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/INodeEx.java b/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/INodeEx.java
deleted file mode 100644
index a04a90d..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/INodeEx.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Hisashi MIYASHITA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.dombycom;
-
-import org.eclipse.actf.util.vocab.IEvalTarget;
-import org.eclipse.swt.graphics.Rectangle;
-import org.w3c.dom.Node;
-
-/**
- * The INodeEx interface defines the methods to be implemented by the node
- * objects that are used in the application. These methods are basic functions
- * for alternative interface.
- */
-public interface INodeEx extends Node, IEvalTarget {
-	/**
-	 * @return the text representation of the node.
-	 */
-	String extractString();
-
-	/**
-	 * @return the heading level of the node. If the node is not heading then
-	 *         "0" will be returned.
-	 */
-	short getHeadingLevel();
-
-	/**
-	 * @return the link URI if the node is a link.
-	 */
-	String getLinkURI();
-
-	/**
-	 * @return the access key of the node.
-	 */
-	char getAccessKey();
-
-	/**
-	 * This maybe a heavy task.
-	 * 
-	 * @return the nth position of the node in the siblings.
-	 */
-	int getNth();
-
-	/**
-	 * The click operation for the element will be simulated.
-	 * 
-	 * @return whether the click is succeeded or not.
-	 */
-	boolean doClick();
-
-	/**
-	 * Highlight the node.
-	 * 
-	 * @return whether the highlight is succeeded or not
-	 */
-	boolean highlight();
-
-	/**
-	 * Unhighlight the node.
-	 * 
-	 * @return whether the unhighlight is succeeded or not
-	 */
-	boolean unhighlight();
-
-	/**
-	 * Set the Focus to the node.
-	 * 
-	 * @return whether the focusing is succeeded or not.
-	 */
-	boolean setFocus();
-
-	/**
-	 * Set the text to the node.
-	 * 
-	 * @param text
-	 *            the text to be set.
-	 */
-	void setText(String text);
-
-	/**
-	 * @return the text of the form element. It is NOT the text representation
-	 *         of the node.
-	 */
-	String getText();
-
-	// !FN!
-	/**
-	 * @return the string array of the information about the image. The array
-	 *         length is 3. Index 0 is the MIMETYPE of the image, Index 1 is the
-	 *         src attribute of the image, Index 2 is an empty string.
-	 */
-	String[] getStillPictureData();
-
-	/**
-	 * @param ar
-	 *            the instance of the AnalyzedResult for store the nodes.
-	 * @return it is the same as <i>ar</i>
-	 */
-	AnalyzedResult analyze(AnalyzedResult ar);
-
-	/**
-	 * @return the location of the node on the client window.
-	 */
-	Rectangle getLocation();
-}
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/INodeExSound.java b/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/INodeExSound.java
deleted file mode 100644
index 30021f8..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/INodeExSound.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Hisashi MIYASHITA - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.actf.model.dom.dombycom;
-
-/**
- * INodeExSound interface defines the methods to be implemented by the sound
- * object.
- */
-public interface INodeExSound {
-	/**
-	 * The minimum volume value. Each implementation convert the 0-1090 scale to
-	 * the original scale.
-	 */
-	int VOLUME_MIN = 0;
-	/**
-	 * The maximum volume value. Each implementation convert the 0-1000 scale to
-	 * the original scale.
-	 */
-	int VOLUME_MAX = 1000;
-
-	/**
-	 * @return whether the sound object is muted or not.
-	 */
-	boolean getMuteState();
-
-	/**
-	 * @param flag whether the sound object will be muted or not.
-	 * @return whether the operation is succeeded or not.
-	 */
-	boolean muteMedia(boolean flag);
-
-	// 0 -- 1000
-	/**
-	 * @return the volume.
-	 */
-	int getVolume();
-
-	/**
-	 * @param val the volume
-	 * @return whether the operation is succeeded or not.
-	 */
-	boolean setVolume(int val);
-}
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/INodeExVideo.java b/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/INodeExVideo.java
deleted file mode 100644
index 07fb364..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/INodeExVideo.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Hisashi MIYASHITA - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.actf.model.dom.dombycom;
-
-/**
- * INodeExVideo interface defines the methods to be implemented by the video
- * object.
- */
-public interface INodeExVideo {
-	/**
-	 * The enumeration of the state of the video.
-	 */
-	public enum VideoState {
-		STATE_UNKNOWN, //
-		STATE_PLAY, //
-		STATE_STOP, //
-		STATE_PAUSE, //
-		STATE_FASTFORWARD, //
-		STATE_FASTREVERSE, //
-		STATE_WAITING
-	};
-
-	/**
-	 * @return the current state.
-	 */
-	VideoState getCurrentState();
-
-	/**
-	 * @return whether the operation is succeeded or not.
-	 */
-	boolean previousTrack();
-
-	/**
-	 * @return whether the operation is succeeded or not.
-	 */
-	boolean nextTrack();
-
-	/**
-	 * @return whether the operation is succeeded or not.
-	 */
-	boolean stopMedia();
-
-	/**
-	 * @return whether the operation is succeeded or not.
-	 */
-	boolean playMedia();
-
-	/**
-	 * @return whether the operation is succeeded or not.
-	 */
-	boolean pauseMedia();
-
-	/**
-	 * @return whether the operation is succeeded or not.
-	 */
-	boolean fastReverse();
-
-	/**
-	 * @return whether the operation is succeeded or not.
-	 */
-	boolean fastForward();
-
-	/**
-	 * @return the current playing position in seconds.
-	 */
-	double getCurrentPosition();
-
-	/**
-	 * @return the total media length in seconds.
-	 */
-	double getTotalLength();
-
-	/**
-	 * @return the HTML element corresponding to the video object.
-	 */
-	INodeEx getReferenceNode();
-}
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/IObjectElementFactory.java b/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/IObjectElementFactory.java
deleted file mode 100644
index baffd23..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/IObjectElementFactory.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Kentarou FUKUDA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.dombycom;
-
-import org.eclipse.actf.model.dom.dombycom.impl.NodeImpl;
-import org.eclipse.actf.util.win32.comclutch.IDispatch;
-
-/**
- * IObjectElementFactory interface defines the methods to be implemented by the
- * extension of the DOM object.
- */
-public interface IObjectElementFactory {
-
-	/**
-	 * @param base an instance of INodeEx which becomes the base of the new Node.
-	 * @param inode the instance of the IDispatch which is the target to create. 
-	 * @return the new node of wrapper of the <i>inode</i>. 
-	 */
-	public NodeImpl createTopNode(NodeImpl base, IDispatch inode);
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/ISelectElement.java b/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/ISelectElement.java
deleted file mode 100644
index 6a4e68a..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/ISelectElement.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Daisuke SATO - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.actf.model.dom.dombycom;
-
-/**
- * ISelectElement interface defines the methods to be implemented by the form
- * select element such as combo box and list box.
- */
-public interface ISelectElement extends INodeEx {
-	/**
-	 * @param indices
-	 *            the indices to be set.
-	 */
-	public void setSelectedIndices(int[] indices);
-
-	/**
-	 * @return the selected indices.
-	 */
-	public int[] getSelectedIndices();
-
-	/**
-	 * @return the total number of the item in the select.
-	 */
-	public int getOptionsCount();
-
-	/**
-	 * @param index the index of the option to be obtained.
-	 * @return the text of the item specified by the <i>index</i>.
-	 */
-	public String getOptionTextAt(int index);
-}
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/IStyle.java b/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/IStyle.java
deleted file mode 100644
index 9a9576d..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/IStyle.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Daisuke SATO - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.actf.model.dom.dombycom;
-
-/**
- * IStyle interface defines the simplest methods to be implemented by HTML Style
- * object.
- */
-public interface IStyle {
-	/**
-	 * @param name the style name.
-	 * @param value the style value.
-	 * @return whether the operation is succeeded or not.
-	 */
-	boolean put(String name, String value);
-
-	/**
-	 * @param name the style name to be obtained.
-	 * @return the value of the style. It might be a String, a Number, or a Object.
-	 */
-	Object get(String name);
-}
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/AttrImpl.java b/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/AttrImpl.java
deleted file mode 100644
index 1de66a9..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/AttrImpl.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Hisashi MIYASHITA - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.actf.model.dom.dombycom.impl;
-
-import org.eclipse.actf.util.win32.comclutch.IDispatch;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.TypeInfo;
-
-
-
-public class AttrImpl extends NodeImpl implements Attr {
-    AttrImpl(NodeImpl baseNode, IDispatch inode) {
-        super(baseNode, inode, Node.ATTRIBUTE_NODE);
-    }
-
-    public String getName() {
-        return (String) Helper.get(inode, "name"); //$NON-NLS-1$
-    }
-
-    public boolean getSpecified() {
-        // We regard `this' attribute is always specified in HTML DOM whenever `this' exists.
-        return true;
-    }
-
-    public String getValue() {
-        return (String) Helper.get(inode, "value"); //$NON-NLS-1$
-    }
-
-    public void setValue(String value) throws DOMException {
-        Helper.put(inode, "value", value); //$NON-NLS-1$
-    }
-
-    public Element getOwnerElement() {
-        IDispatch i = (IDispatch) Helper.get(inode, "parentNode"); //$NON-NLS-1$
-        if (i == null) return null;
-        return (Element) newNode(i, Node.ELEMENT_NODE);
-    }
-
-    public TypeInfo getSchemaTypeInfo() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public boolean isId() {
-        // TODO Auto-generated method stub
-        return false;
-    }
-}
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/DocumentImpl.java b/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/DocumentImpl.java
deleted file mode 100644
index e89630b..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/DocumentImpl.java
+++ /dev/null
@@ -1,327 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Hisashi MIYASHITA - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.actf.model.dom.dombycom.impl;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import org.eclipse.actf.model.dom.dombycom.IDocumentEx;
-import org.eclipse.actf.model.dom.dombycom.impl.html.HTMLElementFactory;
-import org.eclipse.actf.util.win32.comclutch.DispatchException;
-import org.eclipse.actf.util.win32.comclutch.IDispatch;
-import org.eclipse.actf.util.win32.comclutch.IEnumUnknown;
-import org.eclipse.actf.util.win32.comclutch.IOleContainer;
-import org.eclipse.actf.util.win32.comclutch.IUnknown;
-import org.w3c.dom.Attr;
-import org.w3c.dom.CDATASection;
-import org.w3c.dom.Comment;
-import org.w3c.dom.DOMConfiguration;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.DOMImplementation;
-import org.w3c.dom.DocumentFragment;
-import org.w3c.dom.DocumentType;
-import org.w3c.dom.Element;
-import org.w3c.dom.EntityReference;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.ProcessingInstruction;
-import org.w3c.dom.Text;
-
-
-
-public class DocumentImpl extends NodeImpl implements IDocumentEx {
-    private IDispatch htmlDocument;
-
-    // Unique ID -> NodeImpl
-    private HashMap<String, NodeImpl> inodeMap;
-
-    synchronized NodeImpl lookupNode(String uniqueName) {
-        NodeImpl n = inodeMap.get(uniqueName);
-        return n;
-    }
-
-    synchronized void regNode(String uniqueName, NodeImpl node) {
-        inodeMap.put(uniqueName, node);
-    }
-
-    public DocumentImpl(IDispatch htmlDocument) {
-        super(htmlDocument);
-        inodeMap = new HashMap<String, NodeImpl>();
-        this.htmlDocument = htmlDocument;
-    }
-
-    public Element getDocumentElement() {
-        IDispatch inode = (IDispatch) Helper.get(htmlDocument, "documentElement"); //$NON-NLS-1$
-        return (Element) newNode(inode, Node.ELEMENT_NODE);
-    }
-
-    public DocumentType getDoctype() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public DOMImplementation getImplementation() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public DocumentFragment createDocumentFragment() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public Text createTextNode(String data) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public Comment createComment(String data) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public CDATASection createCDATASection(String data) throws DOMException {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public ProcessingInstruction createProcessingInstruction(String target, String data) throws DOMException {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public Attr createAttribute(String name) throws DOMException {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public EntityReference createEntityReference(String name) throws DOMException {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public NodeList getElementsByTagName(String tagname) {
-        IDispatch r = (IDispatch) inode.invoke1("getElementsByTagName", tagname); //$NON-NLS-1$
-        if (r == null)
-            return null;
-        return new NodeListImpl(this, r);
-    }
-
-    public Node importNode(Node importedNode, boolean deep) throws DOMException {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public Element createElementNS(String namespaceURI, String qualifiedName) throws DOMException {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public Attr createAttributeNS(String namespaceURI, String qualifiedName) throws DOMException {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public NodeList getElementsByTagNameNS(String namespaceURI, String localName) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public Element getElementById(String elementId) {
-        IDispatch i = (IDispatch) inode.invoke1("getElementById", elementId); //$NON-NLS-1$
-        if (i == null)
-            return null;
-        return (Element) newNode(i, Node.ELEMENT_NODE);
-    }
-
-    public List<Node> getElementsByIdInAllFrames(String id) {
-        List<Node> r = new ArrayList<Node>();
-        Element e = getElementById(id);
-        if (e != null)
-            r.add(e);
-        
-        List<Node> ids = getElementsByIdInFrames(htmlDocument, id);
-        if (ids != null)
-            r.addAll(ids);
-        return r;
-    }
-    
-    private List<Node> getElementsByIdInFrames(IDispatch htmlDocument, String id) {
-        if (!hasFrames(htmlDocument))
-            return null;
-        
-        List<Node> r = new ArrayList<Node>();
-        IOleContainer iole = (IOleContainer) htmlDocument.queryInterface(IUnknown.IID_IOleContainer);
-        IEnumUnknown ieu = iole.enumObjects(IOleContainer.OLECONTF_EMBEDDINGS);
-
-        if (ieu != null) {
-            IUnknown[] iunks;
-            for (iunks = ieu.next(1); iunks != null && iunks.length > 0; iunks = ieu.next(1)) {
-                try {
-                    IDispatch idisp = (IDispatch) iunks[0].queryInterface(IUnknown.IID_IWebBrowser2);
-                    if (idisp != null) {
-                        IDispatch d = (IDispatch) Helper.get(idisp, "Document"); //$NON-NLS-1$
-                        if (d == null)
-                            continue;
-                        List<Node> r2 = getElementsByIdInFrames(d, id);
-                        if (r2 != null)
-                            r.addAll(r2);
-                        IDispatch in = (IDispatch) d.invoke1("getElementById", id); //$NON-NLS-1$
-                        if (in == null)
-                            continue;
-                        Node n = newNode(in, Node.ELEMENT_NODE);
-                        if (n == null)
-                            continue;
-                        r.add(n);
-                    }
-                } catch (DispatchException ex) {
-                }
-            }
-        }
-        return r;
-    }
-
-    private boolean hasFrames(IDispatch htmlDocument) {
-        IDispatch r = (IDispatch) htmlDocument.invoke1("getElementsByTagName", "frame"); //$NON-NLS-1$ //$NON-NLS-2$
-        if (r != null) {
-            NodeListImpl nl = new NodeListImpl(this, r);
-            if (nl.getLength() > 0)
-                return true;
-        }
-        
-        r = (IDispatch) htmlDocument.invoke1("getElementsByTagName", "iframe");  //$NON-NLS-1$  //$NON-NLS-2$
-        if (r != null) {
-            NodeListImpl nl = new NodeListImpl(this, r);
-            if (nl.getLength() > 0)
-                return true;
-        }
-        
-        return false;
-    }
-
-    public String getInputEncoding() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public String getXmlEncoding() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public boolean getXmlStandalone() {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    public void setXmlStandalone(boolean xmlStandalone) throws DOMException {
-        // TODO Auto-generated method stub
-
-    }
-
-    public String getXmlVersion() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public void setXmlVersion(String xmlVersion) throws DOMException {
-        // TODO Auto-generated method stub
-
-    }
-
-    public boolean getStrictErrorChecking() {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    public void setStrictErrorChecking(boolean strictErrorChecking) {
-        // TODO Auto-generated method stub
-
-    }
-
-    public String getDocumentURI() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public void setDocumentURI(String documentURI) {
-        // TODO Auto-generated method stub
-
-    }
-
-    public Node adoptNode(Node source) throws DOMException {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public DOMConfiguration getDomConfig() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public void normalizeDocument() {
-        // TODO Auto-generated method stub
-
-    }
-
-    public Node renameNode(Node n, String namespaceURI, String qualifiedName) throws DOMException {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public Element getTargetElement(String target) {
-        NodeList list = getElementsByTagName("A"); //$NON-NLS-1$
-        for (int i = 0; i < list.getLength(); i++) {
-            Element el = (Element) list.item(i);
-            if (target.equals(el.getAttribute("name"))) { //$NON-NLS-1$
-                return el;
-            }
-        }
-
-        return getElementById(target);
-    }
-
-    // --------------------------------------------------------------------------------
-    // private extension
-    // --------------------------------------------------------------------------------
-
-    public StyleSheetImpl createStyleSheet() {
-        try {
-            if (inode == null)
-                return null;
-            IDispatch r = (IDispatch) inode.invoke0("createStyleSheet"); //$NON-NLS-1$
-            if (r == null)
-                return null;
-            return new StyleSheetImpl(r);
-        } catch (DispatchException e) {
-            return null;
-        }
-    }
-
-    public Element createElement(String tagName) throws DOMException {
-        return HTMLElementFactory.createElement(this, inode, tagName);
-    }
-
-    public String getCompatMode() {
-        return (String) Helper.get(htmlDocument, "compatMode"); //$NON-NLS-1$
-    }
-
-    public IDispatch getWindow() {
-        return (IDispatch) Helper.get(inode, "parentWindow"); //$NON-NLS-1$
-    }
-
-    public IDispatch getDocument() {
-        return (IDispatch) Helper.get(inode, "documentElement"); //$NON-NLS-1$
-    }
-
-}
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/Helper.java b/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/Helper.java
deleted file mode 100644
index 7a8fd20..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/Helper.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Hisashi MIYASHITA - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.actf.model.dom.dombycom.impl;
-
-import org.eclipse.actf.util.win32.comclutch.DispatchException;
-import org.eclipse.actf.util.win32.comclutch.IDispatch;
-import org.eclipse.swt.graphics.Rectangle;
-import org.w3c.dom.DOMException;
-
-
-
-public class Helper {
-    static public Object get(IDispatch idisp, String prop) {
-        try {
-            if (idisp == null) return null;
-            return idisp.get(prop);
-        } catch (DispatchException e) {
-            //e.printStackTrace();
-            return null;
-        }
-    }
-    static public boolean put(IDispatch idisp, String prop, Object val) {
-        try {
-            idisp.put(prop, val);
-            return true;
-        } catch (DispatchException e) {
-            e.printStackTrace();
-            return false;
-        }
-    }
-
-    static public boolean hasProperty(IDispatch idisp, String prop) {
-        try {
-            Object r = idisp.get(prop);
-            if (r != null) return true;
-        } catch (DispatchException e) {
-        }
-        return false;
-    }
-
-    static public String trimHTMLStr(String src) {
-        src = src.trim();
-        StringBuffer ret = new StringBuffer();
-        for (int i = 0; i < src.length(); i++) {
-            char c = src.charAt(i);
-            if (c == '\u00a0') {
-                // &nbsp;
-            } else {
-                ret.append(c);
-            }
-        }
-        String r = ret.toString();
-        // if (r.matches("\\A([\\uff5c\\u30fb|])\\z")) return "";
-        return r;
-    }
-
-    static public void notSupported() throws DOMException {
-        throw new DOMException(DOMException.NOT_SUPPORTED_ERR,
-                               "The specified node must be created by DomByCom"); //$NON-NLS-1$
-    }
-    
-    static public Rectangle getLocation(IDispatch idisp) {
-        Rectangle r = new Rectangle(0, 0, 0, 0);
-        getOffset(idisp, r);
-
-        r.width = (Integer) Helper.get(idisp, "offsetWidth"); //$NON-NLS-1$
-        r.height = (Integer) Helper.get(idisp, "offsetHeight"); //$NON-NLS-1$
-
-        return r;
-    }
-    
-    private static void getOffset(IDispatch inode, Rectangle r) {
-        int ol = (Integer) Helper.get(inode, "offsetLeft"); //$NON-NLS-1$
-        int ot = (Integer) Helper.get(inode, "offsetTop"); //$NON-NLS-1$
-
-        r.x += ol;
-        r.y += ot;
-
-        IDispatch parent = (IDispatch) Helper.get(inode, "offsetParent"); //$NON-NLS-1$
-        //System.out.println(r);
-        if (parent == null)
-            return;
-        getOffset(parent, r);
-    }
-}
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/ListNodeListImpl.java b/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/ListNodeListImpl.java
deleted file mode 100644
index b34f225..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/ListNodeListImpl.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Hisashi MIYASHITA - initial API and implementation
- *******************************************************************************/
-
-
-package org.eclipse.actf.model.dom.dombycom.impl;
-
-import java.util.List;
-
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-
-
-public class ListNodeListImpl implements NodeList {
-    private final List<Node> l;
-
-    public Node item(int index) {
-        if ((index < 0) || (index >= l.size())) return null;
-        return l.get(index);
-    }
-
-    public int getLength() {
-        return l.size();
-    }
-
-    public ListNodeListImpl(List<Node> l) {
-        this.l = l;
-    }
-}
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/NamedNodeMapImpl.java b/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/NamedNodeMapImpl.java
deleted file mode 100644
index 46baa55..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/NamedNodeMapImpl.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Hisashi MIYASHITA - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.actf.model.dom.dombycom.impl;
-
-import java.util.HashMap;
-
-import org.eclipse.actf.util.win32.comclutch.DispatchException;
-import org.eclipse.actf.util.win32.comclutch.IDispatch;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-public class NamedNodeMapImpl implements NamedNodeMap {
-	private IDispatch attributes;
-	private HashMap<AttrKey, Node> attrMap;
-	private NodeImpl baseNode;
-
-	private static class AttrKey {
-		String ns;
-		String name;
-
-		@Override
-		public boolean equals(Object o) {
-			if (!(o instanceof AttrKey))
-				return false;
-			AttrKey ak = (AttrKey) o;
-			return ns.equals(ak.ns) && name.equals(ak.name);
-		}
-
-		@Override
-		public int hashCode() {
-			return ns.hashCode() ^ name.hashCode();
-		}
-
-		AttrKey(String ns, String name) {
-			this.ns = ns;
-			this.name = name;
-		}
-	}
-
-	public NamedNodeMapImpl(NodeImpl baseNode, IDispatch attributes) {
-		this.baseNode = baseNode;
-		this.attributes = attributes;
-	}
-
-	private void initCache() {
-		if (attrMap != null)
-			return;
-		attrMap = new HashMap<AttrKey, Node>();
-		int len = getLength();
-		for (int i = 0; i < len; i++) {
-			Node n = item(i);
-			AttrKey key = new AttrKey(n.getNamespaceURI(), n.getLocalName());
-			attrMap.put(key, n);
-		}
-	}
-
-	public Node item(int index) {
-		try {
-			IDispatch i = (IDispatch) attributes.invoke1(
-					"item", Integer.valueOf(index)); //$NON-NLS-1$
-			return baseNode.newNode(i);
-		} catch (DispatchException e) {
-			e.printStackTrace();
-			return null;
-		}
-	}
-
-	public int getLength() {
-		Integer i = (Integer) Helper.get(attributes, "length"); //$NON-NLS-1$
-		if (i == null)
-			return 0;
-		return i.intValue();
-	}
-
-	public Node getNamedItem(String name) {
-		try {
-			IDispatch i = (IDispatch) attributes.invoke1(
-					"removeNamedItem", name); //$NON-NLS-1$
-			return baseNode.newNode(i);
-		} catch (DispatchException e) {
-			return null;
-		}
-	}
-
-	public Node setNamedItem(Node node) throws DOMException {
-		if (!(node instanceof NodeImpl)) {
-			Helper.notSupported();
-		}
-		NodeImpl ni = (NodeImpl) node;
-		try {
-			IDispatch i = (IDispatch) attributes.invoke1("setNamedItem", //$NON-NLS-1$
-					ni.getINode());
-			return baseNode.newNode(i);
-		} catch (DispatchException e) {
-			return null;
-		}
-	}
-
-	public Node removeNamedItem(String name) throws DOMException {
-		try {
-			IDispatch i = (IDispatch) attributes.invoke1(
-					"removeNamedItem", name); //$NON-NLS-1$
-			return baseNode.newNode(i);
-		} catch (DispatchException e) {
-			return null;
-		}
-	}
-
-	public Node getNamedItemNS(String namespaceURI, String localName) {
-		initCache();
-		Node n = attrMap.get(new AttrKey(namespaceURI, localName));
-		return n;
-	}
-
-	public Node setNamedItemNS(Node node) throws DOMException {
-		initCache();
-		Node n = attrMap.get(new AttrKey(node.getNamespaceURI(), node
-				.getLocalName()));
-		return setNamedItem(n);
-	}
-
-	public Node removeNamedItemNS(String namespaceURI, String localName)
-			throws DOMException {
-		initCache();
-		Node n = attrMap.get(new AttrKey(namespaceURI, localName));
-		return removeNamedItem(n.getNodeName());
-	}
-}
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/NodeImpl.java b/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/NodeImpl.java
deleted file mode 100644
index f29ec51..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/NodeImpl.java
+++ /dev/null
@@ -1,515 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Hisashi MIYASHITA - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.actf.model.dom.dombycom.impl;
-
-import org.eclipse.actf.model.dom.dombycom.AnalyzedResult;
-import org.eclipse.actf.model.dom.dombycom.INodeEx;
-import org.eclipse.actf.model.dom.dombycom.impl.html.HTMLElementFactory;
-import org.eclipse.actf.model.dom.dombycom.impl.object.ObjectElementFactory;
-import org.eclipse.actf.util.vocab.IEvalTarget;
-import org.eclipse.actf.util.vocab.Vocabulary;
-import org.eclipse.actf.util.win32.comclutch.IDispatch;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.UserDataHandler;
-
-@SuppressWarnings("nls")
-public class NodeImpl implements Node {
-	protected final IDispatch inode;
-
-	IDispatch getIDispatch() {
-		return inode;
-	}
-
-	protected final short nodeType;
-
-	private NodeImpl parentNode;
-
-	private DocumentImpl doc;
-
-	String uniqueName;
-
-	private static String getUniqueName(IDispatch inode) {
-		return (String) Helper.get(inode, "uniqueID");
-	}
-
-	private NodeImpl newNodeByType(IDispatch inode, short type) {
-		switch (type) {
-		case Node.ATTRIBUTE_NODE:
-			return new AttrImpl(this, inode);
-		case Node.DOCUMENT_NODE:
-			// return new DocumentImpl(inode);
-			// We would like to keep object identity of DocumentImpl.
-			// Thus returns the base DocumentImpl that must be the same as the
-			// document of "inode".
-			return doc;
-
-		case Node.CDATA_SECTION_NODE:
-		case Node.COMMENT_NODE:
-			// case Node.DOCUMENT_FLAGMENT_NODE:
-		case Node.DOCUMENT_TYPE_NODE:
-			return new NodeImpl(this, inode, type);
-
-		case Node.ELEMENT_NODE:
-			if (Helper.hasProperty(inode, "contentWindow")) {
-				return HTMLElementFactory.create(this, inode, "FrameNode");
-			}
-			String name = (String) Helper.get(inode, "nodeName");
-			if ("OBJECT".equals(name) || "EMBED".equals(name)) {
-				NodeImpl newNode = ObjectElementFactory.create(this, inode);
-				if (newNode != null)
-					return newNode;
-			}
-			return HTMLElementFactory.create(this, inode, name);
-
-		case Node.ENTITY_NODE:
-		case Node.ENTITY_REFERENCE_NODE:
-		case Node.NOTATION_NODE:
-		case Node.PROCESSING_INSTRUCTION_NODE:
-			return new NodeImpl(this, inode, type);
-		case Node.TEXT_NODE:
-			return HTMLElementFactory.create(this, inode, "Text");
-
-		default:
-			return new NodeImpl(this, inode, type);
-		}
-	}
-
-	NodeImpl newNode(IDispatch inode) {
-		if (inode == null)
-			return null;
-		String uniqueName = getUniqueName(inode);
-		if (uniqueName != null) {
-			NodeImpl anode = doc.lookupNode(uniqueName);
-			if (anode != null) {
-				inode.release();
-				return anode;
-			}
-		}
-		Integer val = (Integer) Helper.get(inode, "nodeType");
-		if (val == null)
-			return null;
-		short type = (short) val.intValue();
-		NodeImpl node = newNodeByType(inode, type);
-
-		if (uniqueName != null) {
-			node.uniqueName = uniqueName;
-			doc.regNode(uniqueName, node);
-		}
-		return node;
-	}
-
-	protected NodeImpl newNode(IDispatch inode, short type) {
-		if (inode == null)
-			return null;
-		String uniqueName = getUniqueName(inode);
-		if (uniqueName != null) {
-			NodeImpl anode = doc.lookupNode(uniqueName);
-			if (anode != null) {
-				inode.release();
-				return anode;
-			}
-			NodeImpl node = newNodeByType(inode, type);
-			node.uniqueName = uniqueName;
-			doc.regNode(uniqueName, node);
-			return node;
-		} else {
-			return newNodeByType(inode, type);
-		}
-	}
-
-	protected NodeImpl newNode(IDispatch inode, short type, NodeImpl parent) {
-		NodeImpl node = newNode(inode, type);
-		node.parentNode = parent;
-		return node;
-	}
-
-	public IDispatch getINode() {
-		return inode;
-	}
-
-	// Special constructor for Document Node.
-	NodeImpl(IDispatch inode) {
-		this.doc = (DocumentImpl) this;
-		this.inode = inode;
-		this.nodeType = Node.DOCUMENT_NODE;
-	}
-
-	protected NodeImpl(NodeImpl baseNode, IDispatch inode, short nodeType) {
-		this.doc = baseNode.doc;
-		this.inode = inode;
-		this.nodeType = nodeType;
-	}
-
-	private String cachedNodeName = null;
-
-	public String getNodeName() {
-		if (cachedNodeName == null) {
-			cachedNodeName = (String) Helper.get(inode, "nodeName");
-		}
-		return cachedNodeName;
-	}
-
-	public String getNodeValue() throws DOMException {
-		Object text = Helper.get(inode, "nodeValue");
-		if (text == null)
-			return null;
-		if (text instanceof String)
-			return (String) text;
-		if (text instanceof IDispatch) {
-			return (String) Helper.get((IDispatch) text, "data");
-		}
-		return null;
-	}
-
-	public void setNodeValue(String nodeValue) throws DOMException {
-		Helper.put(inode, "nodeValue", nodeValue);
-	}
-
-	public short getNodeType() {
-		return nodeType;
-	}
-
-	public Node getParentNode() {
-		if (parentNode == null) {
-			IDispatch parent = (IDispatch) Helper.get(inode, "parentNode");
-			parentNode = newNode(parent);
-		}
-		return parentNode;
-	}
-
-	private NodeListNextSiblingImpl cachedChildNodes;
-
-	public NodeList getChildNodes() {
-		if (cachedChildNodes != null) {
-			cachedChildNodes.initialize();
-		} else {
-			if (false) {
-				// Caution!
-				// Due to IE's problem, "childNodes" property may have wrong
-				// value
-				// unless the document is well-formed. We avoid using this
-				// property,
-				// and use "nextSibling" instead of that.
-				IDispatch nodeCollection = (IDispatch) Helper.get(inode,
-						"childNodes");
-				if (nodeCollection == null)
-					return null;
-				// cachedChildNodes = new NodeListImpl(this, nodeCollection);
-			} else {
-				cachedChildNodes = new NodeListNextSiblingImpl(this);
-			}
-		}
-		return cachedChildNodes;
-	}
-
-	public Node getFirstChild() {
-		IDispatch firstChild = (IDispatch) Helper.get(inode, "firstChild");
-		return newNode(firstChild);
-	}
-
-	public Node getLastChild() {
-		IDispatch lastChild = (IDispatch) Helper.get(inode, "lastChild");
-		return newNode(lastChild);
-	}
-
-	public Node getPreviousSibling() {
-		IDispatch previousSibling = (IDispatch) Helper.get(inode,
-				"previousSibling");
-		return newNode(previousSibling);
-	}
-
-	public Node getNextSibling() {
-		IDispatch nextSibling = (IDispatch) Helper.get(inode, "nextSibling");
-		return newNode(nextSibling);
-	}
-
-	public NamedNodeMap getAttributes() {
-		IDispatch attributes = (IDispatch) Helper.get(inode, "attributes");
-		if (attributes == null)
-			return null;
-		return new NamedNodeMapImpl(this, attributes);
-	}
-
-	public Document getOwnerDocument() {
-		return doc;
-	}
-
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		if (!((newChild instanceof NodeImpl) && (refChild instanceof NodeImpl))) {
-			Helper.notSupported();
-		}
-		NodeImpl nci = (NodeImpl) newChild;
-		NodeImpl rci = (NodeImpl) refChild;
-		IDispatch i = (IDispatch) inode.invoke("insertBefore", new Object[] {
-				nci.getINode(), rci.getINode() });
-		return newNode(i);
-	}
-
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		if (!((newChild instanceof NodeImpl) && (oldChild instanceof NodeImpl))) {
-			Helper.notSupported();
-		}
-		NodeImpl nci = (NodeImpl) newChild;
-		NodeImpl oci = (NodeImpl) oldChild;
-		IDispatch i = (IDispatch) inode.invoke("replaceChild", new Object[] {
-				nci.getINode(), oci.getINode() });
-		return newNode(i);
-	}
-
-	public Node removeChild(Node oldChild) throws DOMException {
-		if (!(oldChild instanceof NodeImpl)) {
-			Helper.notSupported();
-		}
-		NodeImpl oci = (NodeImpl) oldChild;
-		IDispatch i = (IDispatch) inode.invoke1("removeChild", oci.getINode());
-		return newNode(i);
-	}
-
-	public Node appendChild(Node newChild) throws DOMException {
-		if (!(newChild instanceof NodeImpl)) {
-			Helper.notSupported();
-		}
-		NodeImpl nci = (NodeImpl) newChild;
-		IDispatch i = (IDispatch) inode.invoke1("appendChild", nci.getINode());
-		return newNode(i);
-	}
-
-	public boolean hasChildNodes() {
-		Boolean b = (Boolean) inode.invoke0("hasChildNodes");
-		if (b == null)
-			return false;
-		return b.booleanValue();
-	}
-
-	public Node cloneNode(boolean deep) {
-		IDispatch i = (IDispatch) inode.invoke1("cloneNode", Boolean
-				.valueOf(deep));
-		return newNode(i);
-	}
-
-	public void normalize() {
-		// Do nothing.
-	}
-
-	public boolean isSupported(String feature, String version) {
-		// TODO: Currently we regard all features are not supported.
-		return false;
-	}
-
-	public String getNamespaceURI() {
-		String r = (String) Helper.get(inode, "namespaceURI");
-		if (r == null)
-			return "";
-		// Treat the local namespace as null for XPath 1.0 data model.
-		if (r.length() == 0)
-			return "";
-		return r;
-	}
-
-	public String getPrefix() {
-		String r = getNodeName();
-		if (r == null)
-			return "";
-		int pos = r.indexOf(":");
-		if (pos < 0)
-			return "";
-		return r.substring(0, pos);
-	}
-
-	public void setPrefix(String prefix) throws DOMException {
-		throw new UnsupportedOperationException();
-	}
-
-	public String getLocalName() {
-		String r = getNodeName();
-		if (r == null)
-			return "";
-		int pos = r.indexOf(":");
-		if (pos < 0)
-			return r;
-		return r.substring(pos + 1);
-	}
-
-	public boolean hasAttributes() {
-		IDispatch attributes = (IDispatch) Helper.get(inode, "attributes");
-		if (attributes == null)
-			return false;
-		return true;
-	}
-
-	public String getBaseURI() {
-		// No way to obtain base URI!
-		return null;
-	}
-
-	public short compareDocumentPosition(Node other) throws DOMException {
-		// We do not support compareDocumentPosition
-		return 0;
-	}
-
-	public String getTextContent() throws DOMException {
-		throw new UnsupportedOperationException();
-	}
-
-	public void setTextContent(String textContent) throws DOMException {
-		throw new UnsupportedOperationException();
-	}
-
-	public boolean isSameNode(Node other) {
-		if (this == other)
-			return true;
-		return false;
-	}
-
-	public String lookupPrefix(String namespaceURI) {
-		throw new UnsupportedOperationException();
-	}
-
-	public boolean isDefaultNamespace(String namespaceURI) {
-		throw new UnsupportedOperationException();
-	}
-
-	public String lookupNamespaceURI(String prefix) {
-		throw new UnsupportedOperationException();
-	}
-
-	public boolean isEqualNode(Node arg) {
-		throw new UnsupportedOperationException();
-	}
-
-	public Object getFeature(String feature, String version) {
-		throw new UnsupportedOperationException();
-	}
-
-	public Object getUserData(String key) {
-		throw new UnsupportedOperationException();
-	}
-
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	// --------------------------------------------------------------------------------
-	// INodeEx interface
-	// --------------------------------------------------------------------------------
-	public String getLinkURI() {
-		String uri = (String) Helper.get(inode, "href");
-		if (uri == null) {
-			Node p = getParentNode();
-			if (p instanceof INodeEx) {
-				return ((INodeEx) p).getLinkURI();
-			}
-			return null;
-		}
-		return uri;
-	}
-
-	public short getHeadingLevel() {
-		Node parent = getParentNode();
-		if (parent instanceof INodeEx) {
-			return ((INodeEx) parent).getHeadingLevel();
-		}
-		return (short) 0;
-	}
-
-	public AnalyzedResult analyze(AnalyzedResult ar) {
-		if (!Vocabulary.isValidNode().eval((IEvalTarget) this))
-			return ar;
-		Node n = getFirstChild();
-
-		while (n != null) {
-			if (n instanceof INodeEx) {
-				ar = ((INodeEx) n).analyze(ar);
-			}
-			n = n.getNextSibling();
-		}
-		return ar;
-	}
-
-	public void setText(String text) {
-		if (Helper.hasProperty(inode, "value")) {
-			Helper.put(inode, "value", text);
-		} else {
-			NodeImpl element = (NodeImpl) getParentNode();
-			if ("TEXTAREA".equals(element.getLocalName())) {
-				IDispatch tr = (IDispatch) element.inode
-						.invoke0("createTextRange");
-				Helper.put(tr, "text", text);
-			}
-		}
-	}
-
-	public String getText() {
-		String ret = "";
-		if (Helper.hasProperty(inode, "value")) {
-			Object obj = Helper.get(inode, "value");
-			if (obj instanceof String) {
-				return (String) obj;
-			} else if (null != obj) {
-				// TODO check other case
-				// System.err.println(obj+" "+obj.toString());
-				return obj.toString();
-			}
-		} else {
-			NodeImpl element = (NodeImpl) getParentNode();
-			if ("TEXTAREA".equals(element.getLocalName())) {
-				IDispatch tr = (IDispatch) element.inode
-						.invoke0("createTextRange");
-				ret = (String) Helper.get(tr, "text");
-			}
-		}
-		if (ret == null)
-			return "";
-		return ret;
-	}
-
-	public int getNth() {
-		IDispatch current = inode;
-		int i;
-		for (i = 1; current != null; i++) {
-			current = (IDispatch) Helper.get(current, "previousSibling");
-		}
-		return i;
-	}
-
-	public String getUniqueID() {
-		return (String) Helper.get(inode, "uniqueID");
-	}
-
-	// !FN!
-	public String[] getStillPictureData() {
-		String[] ret = new String[3];
-		ret[1] = (String) Helper.get(inode, "src");
-		ret[2] = "";
-		String mt = (String) Helper.get(inode, "mimeType");
-		if (mt == null) {
-			ret[0] = "";
-		} else {
-			mt = mt.toUpperCase();
-			if (mt.contains("GIF")) {
-				ret[0] = "image/gif";
-			} else if (mt.contains("JPEG")) {
-				ret[0] = "image/jpeg";
-			} else if (mt.contains("PNG")) {
-				ret[0] = "image/png";
-			} else {
-				ret[0] = "";
-			}
-		}
-		return ret;
-	}
-}
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/NodeListImpl.java b/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/NodeListImpl.java
deleted file mode 100644
index f1c4e7c..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/NodeListImpl.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Hisashi MIYASHITA - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.actf.model.dom.dombycom.impl;
-
-import org.eclipse.actf.util.win32.comclutch.DispatchException;
-import org.eclipse.actf.util.win32.comclutch.IDispatch;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class NodeListImpl implements NodeList {
-	private IDispatch inodeCollection;
-	private NodeImpl baseNode;
-
-	public NodeListImpl(NodeImpl baseNode, IDispatch inodeCollection) {
-		this.baseNode = baseNode;
-		this.inodeCollection = inodeCollection;
-	}
-
-	public Node item(int index) {
-		try {
-			IDispatch i = (IDispatch) inodeCollection.invoke1(
-					"item", Integer.valueOf(index)); //$NON-NLS-1$
-			return baseNode.newNode(i);
-		} catch (DispatchException e) {
-			return null;
-		}
-	}
-
-	public int getLength() {
-		Integer i = (Integer) Helper.get(inodeCollection, "length"); //$NON-NLS-1$
-		if (i == null)
-			return 0;
-		return i.intValue();
-	}
-}
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/NodeListNextSiblingImpl.java b/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/NodeListNextSiblingImpl.java
deleted file mode 100644
index a849b16..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/NodeListNextSiblingImpl.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Hisashi MIYASHITA - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.actf.model.dom.dombycom.impl;
-
-import java.util.ArrayList;
-
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class NodeListNextSiblingImpl implements NodeList {
-	private ArrayList<NodeImpl> inodeList = new ArrayList<NodeImpl>();
-
-	private final NodeImpl baseNode;
-
-	public NodeListNextSiblingImpl(NodeImpl baseNode) {
-		this.baseNode = baseNode;
-		initialize();
-	}
-
-	public void initialize() {
-		inodeList.clear();
-		NodeImpl node = (NodeImpl) baseNode.getFirstChild();
-		while (node != null) {
-			if ("HTML".equals(node.getNodeName()) && !("#document".equals(baseNode.getNodeName()))) { //$NON-NLS-1$  //$NON-NLS-2$
-				node = (NodeImpl) node.getNextSibling();
-				continue;
-			}
-
-			inodeList.add(node);
-			node = (NodeImpl) node.getNextSibling();
-		}
-	}
-
-	public Node item(int index) {
-		try {
-			return inodeList.get(index);
-		} catch (IndexOutOfBoundsException e) {
-			return null;
-		}
-	}
-
-	public int getLength() {
-		return inodeList.size();
-	}
-}
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/SingletonNodeListImpl.java b/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/SingletonNodeListImpl.java
deleted file mode 100644
index 07e02db..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/SingletonNodeListImpl.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Hisashi MIYASHITA - initial API and implementation
- *******************************************************************************/
-
-
-package org.eclipse.actf.model.dom.dombycom.impl;
-
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-
-
-public class SingletonNodeListImpl implements NodeList {
-    private final Node node;
-    public Node item(int index) {
-        if (index == 0) return node;
-        return null;
-    }
-
-    public int getLength() {
-        return 1;
-    }
-
-    public SingletonNodeListImpl(Node node) {
-        this.node = node;
-    }
-}
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/StyleImpl.java b/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/StyleImpl.java
deleted file mode 100644
index e441b06..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/StyleImpl.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Daisuke SATO - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.actf.model.dom.dombycom.impl;
-
-import org.eclipse.actf.model.dom.dombycom.IStyle;
-import org.eclipse.actf.util.win32.comclutch.IDispatch;
-
-
-
-
-public class StyleImpl implements IStyle {
-    
-    IDispatch style;
-    
-    public StyleImpl(IDispatch style){
-        this.style = style;
-    }
-
-    public Object get(String name) {
-        return Helper.get(style, name);
-    }
-
-    public boolean put(String name, String value) {
-        return Helper.put(style, name, value);
-    }
-
-}
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/StyleSheetImpl.java b/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/StyleSheetImpl.java
deleted file mode 100644
index b7f9abc..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/StyleSheetImpl.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Hisashi MIYASHITA - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.actf.model.dom.dombycom.impl;
-
-import org.eclipse.actf.util.win32.comclutch.IDispatch;
-
-public class StyleSheetImpl {
-	private IDispatch idispatch;
-
-	public StyleSheetImpl(IDispatch idispatch) {
-		this.idispatch = idispatch;
-	}
-
-	public void addRule(String selector, String style) {
-		idispatch.invoke("addRule", new Object[] { selector, style }); //$NON-NLS-1$
-	}
-}
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/html/CharacterDataImpl.java b/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/html/CharacterDataImpl.java
deleted file mode 100644
index 5cd3066..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/html/CharacterDataImpl.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Hisashi MIYASHITA - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.actf.model.dom.dombycom.impl.html;
-
-import org.eclipse.actf.model.dom.dombycom.impl.Helper;
-import org.eclipse.actf.model.dom.dombycom.impl.NodeImpl;
-import org.eclipse.actf.util.vocab.AbstractTerms;
-import org.eclipse.actf.util.win32.comclutch.IDispatch;
-import org.w3c.dom.CharacterData;
-import org.w3c.dom.DOMException;
-
-@SuppressWarnings("nls")
-abstract class CharacterDataImpl extends NodeImpl implements CharacterData {
-	CharacterDataImpl(NodeImpl baseNode, IDispatch inode, short type) {
-		super(baseNode, inode, type);
-	}
-
-	public String getData() throws DOMException {
-		return (String) Helper.get(inode, "data");
-	}
-
-	public void setData(String data) throws DOMException {
-		Helper.put(inode, "data", data);
-	}
-
-	public int getLength() {
-		Integer i = (Integer) Helper.get(inode, "length");
-		if (i == null)
-			return 0;
-		return i.intValue();
-	}
-
-	public String substringData(int offset, int count) throws DOMException {
-		String r = (String) inode.invoke("substringData", new Object[] {
-				Integer.valueOf(offset), Integer.valueOf(count) });
-		return r;
-	}
-
-	public void appendData(String str) throws DOMException {
-		inode.invoke1("appendData", str);
-	}
-
-	public void insertData(int offset, String str) throws DOMException {
-		inode.invoke("insertData",
-				new Object[] { Integer.valueOf(offset), str });
-	}
-
-	public void deleteData(int offset, int count) throws DOMException {
-		inode.invoke("deleteData", new Object[] { Integer.valueOf(offset),
-				Integer.valueOf(count) });
-	}
-
-	public void replaceData(int offset, int count, String str)
-			throws DOMException {
-		inode.invoke("replaceData", new Object[] { Integer.valueOf(offset),
-				Integer.valueOf(count), str });
-	}
-
-	public AbstractTerms getTerms() {
-		return HTMLTerms.getInstance();
-	}
-}
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/html/ElementImpl.java b/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/html/ElementImpl.java
deleted file mode 100644
index 4feae7d..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/html/ElementImpl.java
+++ /dev/null
@@ -1,760 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Hisashi MIYASHITA - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.actf.model.dom.dombycom.impl.html;
-
-import java.util.HashSet;
-
-import org.eclipse.actf.model.dom.dombycom.AnalyzedResult;
-import org.eclipse.actf.model.dom.dombycom.DomByCom;
-import org.eclipse.actf.model.dom.dombycom.IDocumentEx;
-import org.eclipse.actf.model.dom.dombycom.IElementEx;
-import org.eclipse.actf.model.dom.dombycom.INodeEx;
-import org.eclipse.actf.model.dom.dombycom.IStyle;
-import org.eclipse.actf.model.dom.dombycom.impl.AttrImpl;
-import org.eclipse.actf.model.dom.dombycom.impl.DocumentImpl;
-import org.eclipse.actf.model.dom.dombycom.impl.Helper;
-import org.eclipse.actf.model.dom.dombycom.impl.NamedNodeMapImpl;
-import org.eclipse.actf.model.dom.dombycom.impl.NodeImpl;
-import org.eclipse.actf.model.dom.dombycom.impl.NodeListImpl;
-import org.eclipse.actf.model.dom.dombycom.impl.StyleImpl;
-import org.eclipse.actf.util.vocab.AbstractTerms;
-import org.eclipse.actf.util.vocab.Vocabulary;
-import org.eclipse.actf.util.win32.comclutch.DispatchException;
-import org.eclipse.actf.util.win32.comclutch.IDispatch;
-import org.eclipse.swt.graphics.Rectangle;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-
-@SuppressWarnings("nls")
-public class ElementImpl extends NodeImpl implements IElementEx {
-	protected ElementImpl(NodeImpl baseNode, IDispatch inode) {
-		super(baseNode, inode, Node.ELEMENT_NODE);
-	}
-
-	protected ElementImpl(DocumentImpl baseDoc, IDispatch inode) {
-		super(baseDoc, inode, Node.ELEMENT_NODE);
-	}
-
-	public String getTagName() {
-		return (String) Helper.get(inode, "tagName");
-	}
-
-	private static final Integer getSetAttributeFlag = Integer.valueOf(2);
-
-	public String getAttribute(String name) {
-		IDispatch r = (IDispatch) inode.invoke1("getAttributeNode", name);
-		if (r == null)
-			return null;
-		Boolean b = (Boolean) Helper.get(r, "specified");
-		if (!b.booleanValue())
-			return null;
-		return (String) Helper.get(r, "value");
-	}
-
-	public void setAttribute(String name, String value) throws DOMException {
-		inode.invoke("setAttribute", new Object[] { name, value,
-				getSetAttributeFlag });
-	}
-
-	public void removeAttribute(String name) throws DOMException {
-		inode.invoke1("removeAttribute", name);
-	}
-
-	public String getCurrentAttribute(String name) {
-		String r = (String) inode.invoke("getAttribute", new Object[] { name,
-				getSetAttributeFlag });
-		return r;
-	}
-
-	// public String getSpecifiedAttribute(String name) {
-	// IDispatch r = (IDispatch) inode.invoke1("getAttributeNode", name);
-	// if (r == null)
-	// return null;
-	// Boolean b = (Boolean) Helper.get(r, "specified");
-	// if (!b.booleanValue())
-	// return null;
-	// return (String) Helper.get(r, "value");
-	// }
-
-	public Attr getAttributeNode(String name) {
-		IDispatch r = (IDispatch) inode.invoke1("getAttributeNode", name);
-		if (r == null)
-			return null;
-		return (Attr) newNode(r, Node.ATTRIBUTE_NODE);
-	}
-
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		if (!(newAttr instanceof AttrImpl)) {
-			Helper.notSupported();
-		}
-		AttrImpl a = (AttrImpl) newAttr;
-		IDispatch r = (IDispatch) inode.invoke1("setAttributeNode", a
-				.getINode());
-		if (r == null)
-			return null;
-		return (Attr) newNode(r, Node.ATTRIBUTE_NODE);
-	}
-
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		if (!(oldAttr instanceof AttrImpl)) {
-			Helper.notSupported();
-		}
-		AttrImpl a = (AttrImpl) oldAttr;
-		IDispatch r = (IDispatch) inode.invoke1("removeAttributeNode", a
-				.getINode());
-		if (r == null)
-			return null;
-		return (Attr) newNode(r, Node.ATTRIBUTE_NODE);
-	}
-
-	public NodeList getElementsByTagName(String name) {
-		IDispatch r = (IDispatch) inode.invoke1("getElementsByTagName", name);
-		if (r == null)
-			return null;
-		return new NodeListImpl(this, r);
-	}
-
-	private NamedNodeMapImpl cachedAttributes;
-
-	private void initCache() {
-		if (cachedAttributes != null)
-			return;
-		cachedAttributes = (NamedNodeMapImpl) getAttributes();
-	}
-
-	public String getAttributeNS(String namespaceURI, String localName) {
-		initCache();
-		Attr a = (Attr) cachedAttributes
-				.getNamedItemNS(namespaceURI, localName);
-		if (a == null)
-			return null;
-		return a.getValue();
-	}
-
-	public void setAttributeNS(String namespaceURI, String qualifiedName,
-			String value) throws DOMException {
-		throw new UnsupportedOperationException();
-	}
-
-	public void removeAttributeNS(String namespaceURI, String localName)
-			throws DOMException {
-		initCache();
-		Attr a = (Attr) cachedAttributes
-				.getNamedItemNS(namespaceURI, localName);
-		if (a == null)
-			return;
-		removeAttributeNode(a);
-	}
-
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) {
-		initCache();
-		Attr a = (Attr) cachedAttributes
-				.getNamedItemNS(namespaceURI, localName);
-		if (a == null)
-			return null;
-		return a;
-	}
-
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		throw new UnsupportedOperationException();
-	}
-
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) {
-		throw new UnsupportedOperationException();
-	}
-
-	public boolean hasAttribute(String name) {
-		String val = getAttribute(name);
-		if (val == null)
-			return false;
-		return true;
-	}
-
-	public boolean hasAttributeNS(String namespaceURI, String localName) {
-		String val = getAttributeNS(namespaceURI, localName);
-		if (val == null)
-			return false;
-		return true;
-	}
-
-	public TypeInfo getSchemaTypeInfo() {
-		throw new UnsupportedOperationException();
-	}
-
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		throw new UnsupportedOperationException();
-	}
-
-	public void setIdAttributeNS(String namespaceURI, String localName,
-			boolean isId) throws DOMException {
-		throw new UnsupportedOperationException();
-	}
-
-	public void setIdAttributeNode(Attr idAttr, boolean isId)
-			throws DOMException {
-		throw new UnsupportedOperationException();
-	}
-
-	// --------------------------------------------------------------------------------
-	// INodeEx interface
-	// --------------------------------------------------------------------------------
-
-	public boolean doClick() {
-		try {
-			if ("OPTION".equals(getLocalName())) {
-				Helper.put(inode, "selected", Boolean.valueOf(true));
-				return true;
-			} else if ("SELECT".equals(getLocalName())) {
-				return false;
-			}
-			inode.invoke0("click");
-			return true;
-		} catch (DispatchException e) {
-			e.printStackTrace();
-			return false;
-		}
-	}
-
-	private String originalBorder;
-
-	public boolean highlight() {
-		if (DomByCom.BORDER_MODE == DomByCom.STYLE_BORDER) {
-			String className = (String) Helper.get(inode, "className");
-			if (className == null)
-				return false;
-			className += " CSStoHighlight";
-			Helper.put(inode, "className", className);
-		} else if (DomByCom.BORDER_MODE == DomByCom.DIV_BORDER) {
-			Element div = getOwnerDocument().getElementById(DomByCom.ID_DIV);
-			IStyle style = ((IElementEx) div).getStyle();
-
-			Rectangle r = Helper.getLocation(inode);
-
-			String compatMode = ((IDocumentEx) getOwnerDocument())
-					.getCompatMode();
-			int w = 0;
-			if (compatMode.equals(IDocumentEx.CSS1_COMPAT)) {
-				w = 0;
-			} else if (compatMode.equals(IDocumentEx.BACK_COMPAT)) {
-				w = DomByCom.DIV_BORDER_WIDTH * 2;
-			}
-
-			style.put("left", (r.x - DomByCom.DIV_BORDER_WIDTH) + "px");
-			style.put("top", (r.y - DomByCom.DIV_BORDER_WIDTH) + "px");
-			style.put("width", (r.width + w) + "px");
-			style.put("height", (r.height + w) + "px");
-		} else if (DomByCom.BORDER_MODE == DomByCom.STYLE_BORDER2) {
-			IDispatch style = (IDispatch) Helper.get(inode, "style");
-			if (style == null)
-				return false;
-			originalBorder = (String) Helper.get(style, "cssText");
-			String border = originalBorder + DomByCom.BORDER_STYLE_STRING;
-			Helper.put(style, "cssText", border);
-		}
-
-		try {
-			inode.invoke0("scrollIntoView");
-			inode.invoke0("onmouseover");
-			return true;
-		} catch (DispatchException e) {
-		}
-		return false;
-	}
-
-	public boolean unhighlight() {
-		if (DomByCom.BORDER_MODE == DomByCom.STYLE_BORDER) {
-			String className = (String) Helper.get(inode, "className");
-			if (className == null)
-				return false;
-			String newClassName = className.replaceAll(" CSStoHighlight", "");
-			Helper.put(inode, "className", newClassName);
-		} else if (DomByCom.BORDER_MODE == DomByCom.DIV_BORDER) {
-			Element div = getOwnerDocument().getElementById(DomByCom.ID_DIV);
-			IStyle style = ((IElementEx) div).getStyle();
-			style.put("left", "-1000px");
-			style.put("top", "-1000px");
-			style.put("width", "100px");
-			style.put("height", "100px");
-		} else if (DomByCom.BORDER_MODE == DomByCom.STYLE_BORDER2) {
-			IDispatch style = (IDispatch) Helper.get(inode, "style");
-			if (style == null)
-				return false;
-			Helper.put(style, "cssText", originalBorder);
-		}
-
-		try {
-			inode.invoke0("onmouseout");
-		} catch (DispatchException e) {
-		}
-		return false;
-	}
-
-	static class InputType {
-		public enum InputClass {
-			EDIT, BUTTON, RADIO, CHECKBOX, COMBOBOX, HIDDEN, PASSWORD, FILE
-		}
-
-		private final InputClass inputClass;
-
-		private final String uiString;
-
-		String getUIString() {
-			return uiString;
-		}
-
-		boolean isEdit() {
-			return (inputClass == InputClass.EDIT);
-		}
-
-		boolean isFileEdit() {
-			return (inputClass == InputClass.FILE);
-		}
-
-		boolean isButton() {
-			return (inputClass == InputClass.BUTTON);
-		}
-
-		boolean isRadio() {
-			return (inputClass == InputClass.RADIO);
-		}
-
-		boolean isCheckBox() {
-			return (inputClass == InputClass.CHECKBOX);
-		}
-
-		boolean isComboBox() {
-			return (inputClass == InputClass.COMBOBOX);
-		}
-
-		boolean isHidden() {
-			return (inputClass == InputClass.HIDDEN);
-		}
-
-		boolean isPassword() {
-			return (inputClass == InputClass.PASSWORD);
-		}
-
-		boolean isClickable() {
-			return (isButton() || isRadio() || isCheckBox() || isComboBox());
-		}
-
-		final String htmlType;
-
-		InputType(String uiString, String htmlType, InputClass inputClass) {
-			this.uiString = uiString;
-			this.htmlType = htmlType;
-			this.inputClass = inputClass;
-		}
-
-	}
-
-	private static final InputType[] HTMLINPUTCLASSES = new InputType[] {
-			new InputType("edit", "text", InputType.InputClass.EDIT),
-			new InputType("password edit", "password",
-					InputType.InputClass.PASSWORD),
-			new InputType("radio button", "radio", InputType.InputClass.RADIO),
-			new InputType("checkbox", "checkbox", InputType.InputClass.CHECKBOX),
-			new InputType("file upload edit", "file", InputType.InputClass.FILE),
-			new InputType("", "hidden", InputType.InputClass.HIDDEN),
-			new InputType("button", "submit", InputType.InputClass.BUTTON),
-			new InputType("reset button", "reset", InputType.InputClass.BUTTON),
-			new InputType("button", "button", InputType.InputClass.BUTTON),
-			new InputType("button", "image", InputType.InputClass.BUTTON) };
-
-	InputType getInputType() {
-		Object o = Helper.get(inode, "type");
-		if (!(o instanceof String))
-			return null;
-		String type = (String) o;
-		for (int i = 0; i < HTMLINPUTCLASSES.length; i++) {
-			if (type.equals(HTMLINPUTCLASSES[i].htmlType)) {
-				return HTMLINPUTCLASSES[i];
-			}
-		}
-		return null;
-	}
-
-	private String getInputValue() {
-		return (String) Helper.get(inode, "value");
-	}
-
-	private String modifySrcStr(String src) {
-		int st = src.lastIndexOf('/');
-		int end = src.lastIndexOf('?');
-		if (end == -1)
-			end = src.length();
-		if (st < 0) {
-			if (end < 0)
-				return src;
-			st = 0;
-		} else {
-			st++;
-		}
-		if (end <= st) {
-			return src.substring(st);
-		} else {
-			return src.substring(st, end);
-		}
-	}
-
-	public String extractString() {
-		String name = getLocalName();
-		if ("IMG".equals(name)) {
-
-			String alt = getAttribute("alt");
-			if (alt != null) {
-				alt = Helper.trimHTMLStr(alt);
-			}
-			String title = getAttribute("title");
-			if (title != null) {
-				title = Helper.trimHTMLStr(title);
-				if (alt == null || alt.length() == 0)
-					alt = title;
-			}
-
-			String src = getAttribute("src");
-			if (src != null) {
-				src = modifySrcStr(src);
-			}
-
-			boolean noAlt = (alt == null);
-			boolean nullAlt = ((alt != null) && (alt.length() == 0));
-			boolean isLink = Vocabulary.isLink().eval(this);
-
-			if (isLink) {
-				if (noAlt) {
-					if (Vocabulary.isReadNoAltImageLink()) {
-						return src;
-					} else {
-						return "";
-					}
-				} else if (nullAlt && Vocabulary.isReadNullAltImageLink()) {
-					if (false) {
-						if (anyTextInParentLink())
-							return alt;
-					}
-					return src;
-				}
-				return alt;
-			} else {
-				if (noAlt) {
-					if (Vocabulary.isReadNoAltImage()) {
-						return src;
-					} else {
-						return "";
-					}
-				} else if (nullAlt && Vocabulary.isReadNullAltImage()) {
-					return src;
-				}
-				return alt;
-			}
-		} else if (Vocabulary.isEmbeddedObject().eval(this)) {
-			return "(Embedded Object)";
-		} else if ("INPUT".equals(name)) {
-			InputType type = getInputType();
-			if (type != null) {
-				if (type.isHidden())// || type.isCheckBox() || type.isRadio())
-					return "";
-				String alt = getAttribute("alt");
-				if (alt != null) {
-					alt = Helper.trimHTMLStr(alt);
-					if (alt.length() > 0)
-						return alt;
-				}
-				String value = getInputValue();
-				if (type.isPassword())
-					value = value.replaceAll(".", "*");
-				if (value != null && value.length() > 0) {
-					return value;
-				}
-				String title = getAttribute("title");
-				if (title != null)
-					return title;
-
-			}
-		} else if ("SELECT".equals(name)) {
-			return "Select";
-		} else if ("AREA".equals(name)) {
-			String alt = getAttribute("alt");
-			if (alt != null) {
-				alt = Helper.trimHTMLStr(alt);
-				if (alt.length() > 0)
-					return alt;
-			}
-		}
-
-		if (false) {
-			// title attribute can be added to any element accoding to XHTML2.
-			String title = getAttribute("title");
-			if (title != null) {
-				title = Helper.trimHTMLStr(title);
-				return title;
-			}
-		}
-
-		return "";
-	}
-
-	private boolean anyTextInParentLink() {
-		Node current = this.getParentNode();
-		if (current == null)
-			return false;
-		while (current != null) {
-			if ("A".equals(current.getNodeName())) {
-				break;
-			}
-			current = current.getParentNode();
-		}
-		if (current == null)
-			return false;
-
-		return anyTextInSiblings(current.getFirstChild());
-	}
-
-	private boolean anyTextInSiblings(Node element) {
-		StringBuffer buff = new StringBuffer();
-		Node next = element;
-		while (next != null) {
-			if (next instanceof ImageElementImpl) {
-				next = next.getNextSibling();
-				continue;
-			}
-			if (next instanceof Element) {
-				if (anyTextInSiblings(next.getFirstChild())) {
-					return true;
-				}
-			}
-			if (next instanceof INodeEx) {
-				INodeEx nex = (INodeEx) next;
-				buff.append(nex.extractString());
-			}
-			next = next.getNextSibling();
-		}
-
-		return Helper.trimHTMLStr(buff.toString()).length() > 0;
-	}
-
-	@Override
-	public short getHeadingLevel() {
-		String name = getLocalName();
-		if (name.length() != 2)
-			return super.getHeadingLevel();
-		if (name.charAt(0) != 'H')
-			return super.getHeadingLevel();
-		switch (name.charAt(1)) {
-		case '1':
-			return 1;
-		case '2':
-			return (short) 2;
-		case '3':
-			return (short) 3;
-		case '4':
-			return (short) 4;
-		case '5':
-			return (short) 5;
-		case '6':
-			return (short) 6;
-		}
-		return super.getHeadingLevel();
-	}
-
-	public boolean setFocus() {
-		try {
-			inode.invoke0("focus");
-			return true;
-		} catch (DispatchException e) {
-			e.printStackTrace();
-		}
-		return false;
-	}
-
-	@Override
-	public void setTextContent(String text) {
-		try {
-			Helper.put(inode, "innerText", text);
-		} catch (DispatchException e) {
-			e.printStackTrace();
-		}
-	}
-
-	public IStyle getStyle() {
-		IDispatch style = (IDispatch) Helper.get(inode, "currentStyle");
-		return new StyleImpl(style);
-	}
-
-	public AbstractTerms getTerms() {
-		return HTMLTerms.getInstance();
-	}
-
-	public Rectangle getLocation() {
-		try {
-			return Helper.getLocation(inode);
-		} catch (Exception e) {
-			// System.out.println("getLocation error "+this.extractString());
-		}
-		return null;
-	}
-
-	public Position getRadioPosition() {
-		if (getInputType() == null)
-			return null;
-		if (!getInputType().isRadio())
-			return null;
-
-		Element form = getParentElement(new String[] { "FORM" });
-		if (form == null)
-			return null;
-
-		String radioName = (String) Helper.get(inode, "name");
-
-		Position p = new Position();
-		searchRadioPosition(form, radioName, p, false);
-		return p;
-	}
-
-	private void searchRadioPosition(Element parent, String radioName,
-			Position p, boolean found) {
-		NodeList list = parent.getChildNodes();
-		int len = list.getLength();
-		for (int i = 0; i < len; i++) {
-			Node n = list.item(i);
-			if (n instanceof ElementImpl) {
-				ElementImpl e = (ElementImpl) n;
-				if (e.hasChildNodes()) {
-					searchRadioPosition(e, radioName, p, found);
-				}
-				if (e.getInputType() == null)
-					continue;
-				if (!e.getInputType().isRadio())
-					continue;
-
-				String name = (String) Helper.get(e.getINode(), "name");
-				if (radioName.equals(name)) {
-					if (!found)
-						p.index++;
-					p.total++;
-				}
-				if (e.isSameNode(this)) {
-					found = true;
-				}
-			}
-		}
-	}
-
-	public Position getListPosition() {
-		Element list = getParentElement(new String[] { "UL", "OL", "DL" });
-		Element item = getParentElement(new String[] { "LI", "DT" });
-		if (list == null)
-			return null;
-		Position p = new Position();
-		searchListPosition(list, item, p, false);
-		return p;
-	}
-
-	private void searchListPosition(Element parent, Element item, Position p,
-			boolean found) {
-		NodeList list = parent.getChildNodes();
-		int len = list.getLength();
-		for (int i = 0; i < len; i++) {
-			Node n = list.item(i);
-			if (n instanceof ElementImpl) {
-				ElementImpl e = (ElementImpl) n;
-				String name = e.getNodeName();
-				if (e.hasChildNodes()
-						&& !("UL".equals(name) || "OL".equals(name) || "DL"
-								.equals(name))) {
-					searchListPosition(e, item, p, found);
-				}
-				if (!"LI".equals(e.getNodeName())
-						&& !"DT".equals(e.getNodeName()))
-					continue;
-
-				if (!found)
-					p.index++;
-				p.total++;
-				if (e.isSameNode(item)) {
-					found = true;
-				}
-			}
-		}
-	}
-
-	private Element getParentElement(String[] tagNames) {
-		Element parent = this;
-		HashSet<String> set = new HashSet<String>();
-		for (int i = 0; i < tagNames.length; i++) {
-			set.add(tagNames[i].intern());
-		}
-		String name = parent.getNodeName();
-		while (!set.contains(name.intern())) {
-			Node temp = parent.getParentNode();
-			if (temp == null || !(temp instanceof Element))
-				return null;
-			parent = (Element) temp;
-			name = parent.getNodeName();
-		}
-
-		return parent;
-	}
-
-	public Element getFormLabel() {
-		NodeList nl = getOwnerDocument().getElementsByTagName("LABEL");
-		Object myId = Helper.get(inode, "id");
-		for (int i = 0; i < nl.getLength(); i++) {
-			Node node = nl.item(i);
-			if (node instanceof ElementImpl) {
-				ElementImpl label = (ElementImpl) node;
-				String id = (String) Helper.get(label.inode, "htmlFor");
-
-				if (id == null)
-					continue;
-				if (id.equals(myId))
-					return label;
-			}
-		}
-		return null;
-	}
-
-	public char getAccessKey() {
-		String key = null;
-
-		String name = getNodeName();
-		if ("LABEL".equals(name))
-			return 0;
-
-		Element label = getFormLabel();
-		if (label != null && label instanceof ElementImpl) {
-			key = (String) Helper.get(((ElementImpl) label).inode, "accessKey");
-		} else {
-			key = (String) Helper.get(inode, "accessKey");
-		}
-
-		if (key != null && key.length() == 1)
-			return key.toUpperCase().charAt(0);
-
-		return 0;
-	}
-
-	@Override
-	public AnalyzedResult analyze(AnalyzedResult ar) {
-		char key = getAccessKey();
-		if (key != 0)
-			ar.addAccessKey(this);
-
-		return super.analyze(ar);
-	}
-
-}
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/html/FrameNodeImpl.java b/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/html/FrameNodeImpl.java
deleted file mode 100644
index 94312ca..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/html/FrameNodeImpl.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Hisashi MIYASHITA - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.actf.model.dom.dombycom.impl.html;
-
-import org.eclipse.actf.model.dom.dombycom.INodeEx;
-import org.eclipse.actf.model.dom.dombycom.impl.Helper;
-import org.eclipse.actf.model.dom.dombycom.impl.NodeImpl;
-import org.eclipse.actf.model.dom.dombycom.impl.NodeListImpl;
-import org.eclipse.actf.model.dom.dombycom.impl.SingletonNodeListImpl;
-import org.eclipse.actf.model.dom.dombycom.impl.StyleSheetImpl;
-import org.eclipse.actf.util.dom.EmptyNodeListImpl;
-import org.eclipse.actf.util.win32.comclutch.DispatchException;
-import org.eclipse.actf.util.win32.comclutch.IDispatch;
-import org.eclipse.actf.util.win32.comclutch.IEnumUnknown;
-import org.eclipse.actf.util.win32.comclutch.IOleContainer;
-import org.eclipse.actf.util.win32.comclutch.IUnknown;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-@SuppressWarnings("nls")
-class FrameNodeImpl extends HTMLElementImpl {
-	FrameNodeImpl(NodeImpl baseNode, IDispatch idisp) {
-		super(baseNode, idisp);
-	}
-
-	@Override
-	public NodeList getElementsByTagName(String tagName) {
-		IDispatch document = (IDispatch) Helper.get(inode, "document");
-		IDispatch r = (IDispatch) document.invoke1("getElementsByTagName",
-				tagName);
-		if (r == null)
-			return null;
-		return new NodeListImpl(this, r);
-	}
-
-	private int getFrameIndex() {
-		NodeList frame = getElementsByTagName("frame");
-		if (frame.getLength() > 0)
-			return getFrameIndex(frame);
-
-		NodeList iframe = getElementsByTagName("iframe");
-		if (iframe.getLength() > 0)
-			return getFrameIndex(iframe);
-
-		return -1;
-	}
-
-	private int getFrameIndex(NodeList frame) {
-		int len = frame.getLength();
-		for (int i = 0; i < len; i++) {
-			Node node = frame.item(i);
-			if (!(node instanceof INodeEx))
-				continue;
-			if (((INodeEx) node).isSameNode(this))
-				return i;
-		}
-		return -1;
-	}
-
-	public IDispatch getFrameByIndex(IDispatch document, int index) {
-		IOleContainer iole = (IOleContainer) document
-				.queryInterface(IUnknown.IID_IOleContainer);
-		IEnumUnknown ieu = iole.enumObjects(IOleContainer.OLECONTF_EMBEDDINGS);
-		IUnknown[] iunks;
-		int count = -1;
-		for (iunks = ieu.next(1); iunks != null && iunks.length > 0; iunks = ieu
-				.next(1)) {
-			try {
-				IDispatch idisp = (IDispatch) iunks[0]
-						.queryInterface(IUnknown.IID_IWebBrowser2);
-				iunks[0].release();
-				if (idisp == null)
-					continue;
-				count++;
-				if (count == index) {
-					return idisp;
-				}
-			} catch (DispatchException ex) {
-			}
-		}
-		return null;
-	}
-
-	private Element getFrameRootElement() {
-		IDispatch document = (IDispatch) Helper.get(inode, "document");
-
-		int index = getFrameIndex();
-		if (index < 0)
-			return null;
-
-		IDispatch idisp = getFrameByIndex(document, index);
-		if (idisp == null)
-			return null;
-
-		IDispatch idoc = (IDispatch) Helper.get(idisp, "Document");
-		if (idoc == null)
-			return null;
-		IDispatch ielem = (IDispatch) Helper.get(idoc, "documentElement");
-		if (ielem == null)
-			return null;
-
-		initialize(idoc);
-		return (Element) newNode(ielem, Node.ELEMENT_NODE, this);
-	}
-
-	private void initialize(IDispatch doc) {
-		try {
-			IDispatch r = (IDispatch) doc.invoke0("createStyleSheet");
-			if (r == null)
-				return;
-			StyleSheetImpl style = new StyleSheetImpl(r);
-			style.addRule(".CSStoHighlight",
-					"border: 3px solid green; background: #fdd;");
-		} catch (DispatchException e) {
-
-		}
-	}
-
-	// --------------------------------------------------------------------------------
-	// Node Overriding Impl.
-	// --------------------------------------------------------------------------------
-
-	@Override
-	public Node getFirstChild() {
-		return getFrameRootElement();
-	}
-
-	@Override
-	public Node getLastChild() {
-		return getFrameRootElement();
-	}
-
-	@Override
-	public NodeList getChildNodes() {
-		Node n = getFrameRootElement();
-		if (n == null)
-			return EmptyNodeListImpl.getInstance();
-		return new SingletonNodeListImpl(n);
-	}
-
-	@Override
-	public boolean hasChildNodes() {
-		Node n = getFrameRootElement();
-		if (n == null)
-			return false;
-		return true;
-	}
-
-}
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/html/HTMLElementFactory.java b/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/html/HTMLElementFactory.java
deleted file mode 100644
index d0ac030..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/html/HTMLElementFactory.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Daisuke SATO - initial API and implementation
- *    Kentarou FUKUDA - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.actf.model.dom.dombycom.impl.html;
-
-import org.eclipse.actf.model.dom.dombycom.impl.DocumentImpl;
-import org.eclipse.actf.model.dom.dombycom.impl.NodeImpl;
-import org.eclipse.actf.util.win32.comclutch.DispatchException;
-import org.eclipse.actf.util.win32.comclutch.IDispatch;
-import org.w3c.dom.Element;
-
-@SuppressWarnings("nls")
-public class HTMLElementFactory {
-
-	private static final String IFRAME = "iframe";
-	private static final String TITLE = "title";
-	private static final String IMG = "img";
-	private static final String SELECT = "select";
-	private static final String TEXT = "text";
-	private static final String FRAMENODE = "framenode";
-
-	public static NodeImpl create(NodeImpl base, IDispatch inode, String tagName) {
-		String tagNameLower = tagName.toLowerCase();
-		try {
-			if (tagNameLower.equals(FRAMENODE)) {
-				return new FrameNodeImpl(base, inode);
-			} else if (tagNameLower.equals(TEXT)) {
-				return new TextImpl(base, inode);
-			} else if (tagNameLower.equals(SELECT)) {
-				return new SelectElementImpl(base, inode);
-			} else if (tagNameLower.equals(IMG)) {
-				return new ImageElementImpl(base, inode);
-			} else if (tagNameLower.equals(TITLE)) {
-				return new TitleElementImpl(base, inode);
-			}
-			return new HTMLElementImpl(base, inode);
-		} catch (DispatchException e) {
-		}
-		return null;
-	}
-
-	public static Element createElement(DocumentImpl base, IDispatch inode,
-			String tagName) {
-		try {
-			IDispatch r;
-			r = (IDispatch) inode.invoke1("createElement", tagName);
-			if (r == null)
-				return null;
-
-			if (tagName.toLowerCase().equals(IFRAME)) {
-				return new FrameNodeImpl(base, r);
-			}
-			return new HTMLElementImpl(base, r);
-		} catch (DispatchException e) {
-		}
-		return null;
-	}
-}
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/html/HTMLElementImpl.java b/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/html/HTMLElementImpl.java
deleted file mode 100644
index 70d1e7b..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/html/HTMLElementImpl.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Kentarou FUKUDA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.dombycom.impl.html;
-
-import org.eclipse.actf.model.dom.dombycom.impl.DocumentImpl;
-import org.eclipse.actf.model.dom.dombycom.impl.NodeImpl;
-import org.eclipse.actf.util.win32.comclutch.IDispatch;
-import org.w3c.dom.html.HTMLElement;
-
-@SuppressWarnings("nls")
-public class HTMLElementImpl extends ElementImpl implements HTMLElement {
-
-	private static final String TITLE = "title";
-	private static final String LANG = "lang";
-	private static final String ID = "id";
-	private static final String DIR = "dir";
-	private static final String CLASS = "class";
-
-	protected HTMLElementImpl(NodeImpl baseNode, IDispatch inode) {
-		super(baseNode, inode);
-	}
-
-	protected HTMLElementImpl(DocumentImpl baseDoc, IDispatch inode) {
-		super(baseDoc, inode);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.w3c.dom.html.HTMLElement#getClassName()
-	 */
-	public String getClassName() {
-		return getAttribute(CLASS);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.w3c.dom.html.HTMLElement#getDir()
-	 */
-	public String getDir() {
-		return getAttribute(DIR);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.w3c.dom.html.HTMLElement#getId()
-	 */
-	public String getId() {
-		return getAttribute(ID);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.w3c.dom.html.HTMLElement#getLang()
-	 */
-	public String getLang() {
-		return getAttribute(LANG);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.w3c.dom.html.HTMLElement#getTitle()
-	 */
-	public String getTitle() {
-		return getAttribute(TITLE);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.w3c.dom.html.HTMLElement#setClassName(java.lang.String)
-	 */
-	public void setClassName(String className) {
-		setAttribute(CLASS, className);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.w3c.dom.html.HTMLElement#setDir(java.lang.String)
-	 */
-	public void setDir(String dir) {
-		setAttribute(DIR, dir);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.w3c.dom.html.HTMLElement#setId(java.lang.String)
-	 */
-	public void setId(String id) {
-		setAttribute(ID, id);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.w3c.dom.html.HTMLElement#setLang(java.lang.String)
-	 */
-	public void setLang(String lang) {
-		setAttribute(LANG, lang);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.w3c.dom.html.HTMLElement#setTitle(java.lang.String)
-	 */
-	public void setTitle(String title) {
-		setAttribute(TITLE, title);
-	}
-
-}
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/html/HTMLTerms.java b/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/html/HTMLTerms.java
deleted file mode 100644
index df229b6..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/html/HTMLTerms.java
+++ /dev/null
@@ -1,675 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Daisuke SATO - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.actf.model.dom.dombycom.impl.html;
-
-import java.util.HashSet;
-
-import org.eclipse.actf.model.dom.dombycom.INodeEx;
-import org.eclipse.actf.model.dom.dombycom.impl.Helper;
-import org.eclipse.actf.model.dom.dombycom.impl.html.ElementImpl.InputType;
-import org.eclipse.actf.util.vocab.AbstractTerms;
-import org.eclipse.actf.util.vocab.IEvalTarget;
-import org.eclipse.actf.util.vocab.Vocabulary;
-import org.eclipse.actf.util.win32.comclutch.ComPlugin;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
-
-@SuppressWarnings("nls")
-public class HTMLTerms extends AbstractTerms {
-	// ADDED BY KOBAYASHI ( ////////////////////////////////
-	//
-	@Override
-	public boolean isAlterable(IEvalTarget target) {
-		return isImage(target);
-	}
-
-	private static HTMLTerms instance;
-
-	private static HashSet<String> headingTags;
-
-	private static HashSet<String> listItemTags;
-
-	private static HashSet<String> blockTags;
-
-	private static HashSet<String> listTopTags;
-
-	static {
-		headingTags = new HashSet<String>();
-		headingTags.add("H1".intern());
-		headingTags.add("H2".intern());
-		headingTags.add("H3".intern());
-		headingTags.add("H4".intern());
-		headingTags.add("H5".intern());
-		headingTags.add("H6".intern());
-
-		listItemTags = new HashSet<String>();
-		listItemTags.add("LI".intern());
-		listItemTags.add("DT".intern());
-
-		listTopTags = new HashSet<String>();
-		listTopTags.add("UL".intern());
-		listTopTags.add("OL".intern());
-		listTopTags.add("DL".intern());
-
-		blockTags = new HashSet<String>();
-		blockTags.add("H1".intern());
-		blockTags.add("H2".intern());
-		blockTags.add("H3".intern());
-		blockTags.add("H4".intern());
-		blockTags.add("H5".intern());
-		blockTags.add("H6".intern());
-		blockTags.add("B".intern());
-		blockTags.add("STRONG".intern());
-		blockTags.add("DIV".intern());
-		blockTags.add("SPAN".intern());
-		blockTags.add("P".intern());
-		blockTags.add("FONT".intern());
-
-	}
-
-	public static HTMLTerms getInstance() {
-		if (instance == null) {
-			instance = new HTMLTerms();
-		}
-		return instance;
-	}
-
-	@Override
-	public boolean isValidNode(IEvalTarget target) {
-		if (target instanceof ElementImpl) {
-			ElementImpl element = (ElementImpl) target;
-			String name = element.getLocalName();
-			if ("HEAD".equals(name) || "MAP".equals(name))
-				return false;
-		}
-		return true;
-	}
-
-	@Override
-	public boolean isVisibleNode(IEvalTarget target) {
-		return true;
-	}
-
-	@Override
-	public boolean isMultilineEdit(IEvalTarget target) {
-		if (target instanceof ElementImpl) {
-			ElementImpl element = (ElementImpl) target;
-			String name = element.getLocalName();
-			if ("TEXTAREA".equals(name)) {
-				return true;
-			}
-		} else if (target instanceof TextImpl) {
-			TextImpl text = (TextImpl) target;
-			Node parent = text.getParentNode();
-			if (parent instanceof IEvalTarget) {
-				return isMultilineEdit((IEvalTarget) parent);
-			}
-		}
-		return false;
-	}
-
-	@Override
-	public boolean isSelectOption(IEvalTarget target) {
-		if (target instanceof ElementImpl) {
-			ElementImpl element = (ElementImpl) target;
-			String name = element.getLocalName();
-			if ("OPTION".equals(name)) {
-				return true;
-			}
-		} else if (target instanceof TextImpl) {
-			TextImpl text = (TextImpl) target;
-			Node parent = text.getParentNode();
-			if (parent instanceof IEvalTarget) {
-				return isSelectOption((IEvalTarget) parent);
-			}
-		}
-		return false;
-	}
-
-	@Override
-	public boolean isInputable(IEvalTarget target) {
-		if (target instanceof ElementImpl) {
-			ElementImpl element = (ElementImpl) target;
-			String name = element.getLocalName();
-			if ("INPUT".equals(name)) {
-				InputType type = element.getInputType();
-				if (type == null)
-					return false;
-				return type.isEdit() || type.isPassword() || type.isFileEdit()
-						|| type.isCheckBox() || type.isRadio();
-			} else if ("TEXTAREA".equals(name)) {
-				return true;
-			}
-		} else if (target instanceof TextImpl) {
-			TextImpl text = (TextImpl) target;
-			Node parent = text.getParentNode();
-			if (parent instanceof IEvalTarget) {
-				return Vocabulary.isInputable().eval((IEvalTarget) parent);
-			}
-		}
-
-		return false;
-	}
-
-	@Override
-	public boolean isCombobox(IEvalTarget target) {
-		if (target instanceof ElementImpl) {
-			ElementImpl element = (ElementImpl) target;
-			String name = element.getLocalName();
-			if ("SELECT".equals(name)) {
-				return true;
-			}
-		} else if (target instanceof TextImpl) {
-			TextImpl text = (TextImpl) target;
-			Node parent = text.getParentNode();
-			if (parent instanceof IEvalTarget) {
-				return Vocabulary.isSelectable().eval((IEvalTarget) parent);
-			}
-		}
-
-		return false;
-	}
-
-	@Override
-	public boolean isMultiSelectable(IEvalTarget target) {
-		if (target instanceof ElementImpl) {
-			ElementImpl element = (ElementImpl) target;
-			String name = element.getLocalName();
-			if ("SELECT".equals(name)) {
-				return (Boolean) Helper.get(element.getINode(), "multiple");
-			}
-		} else if (target instanceof TextImpl) {
-			TextImpl text = (TextImpl) target;
-			Node parent = text.getParentNode();
-			if (parent instanceof IEvalTarget) {
-				return Vocabulary.isMultiSelectable()
-						.eval((IEvalTarget) parent);
-			}
-		}
-
-		return false;
-	}
-
-	@Override
-	public boolean isClickable(IEvalTarget target) {
-		if (target instanceof TextImpl) {
-			TextImpl text = (TextImpl) target;
-			Node parent = text.getParentNode();
-			if (parent instanceof IEvalTarget) {
-				return Vocabulary.isClickable().eval((IEvalTarget) parent);
-			}
-		}
-		if (target instanceof ElementImpl) {
-			ElementImpl element = (ElementImpl) target;
-			String name = element.getLocalName();
-			String href = (String) Helper.get(element.getINode(), "href");
-			if (("A".equals(name) || "AREA".equals(name)) && href != null
-					&& href.length() > 0)
-				return true;
-			if ("BUTTON".equals(name) || "OPTION".equals(name))
-				return true;
-			if ("INPUT".equals(name)) {
-				InputType type = element.getInputType();
-				if (type != null) {
-					return type.isClickable();
-				}
-			}
-
-			if (Helper.hasProperty(element.getINode(), "onclick"))
-				return true;
-
-		}
-		if (target instanceof Node) {
-			Node node = (Node) target;
-			Node p = node.getParentNode();
-			if (p instanceof IEvalTarget)
-				return Vocabulary.isClickable().eval((IEvalTarget) p);
-		}
-
-		return false;
-	}
-
-	@Override
-	public boolean isLink(IEvalTarget target) {
-		if (target instanceof TextImpl) {
-			TextImpl text = (TextImpl) target;
-			Node parent = text.getParentNode();
-			if (parent instanceof IEvalTarget) {
-				return Vocabulary.isLink().eval((IEvalTarget) parent);
-			}
-		}
-		if (target instanceof ElementImpl) {
-			ElementImpl element = (ElementImpl) target;
-			String name = element.getLocalName();
-			String href = (String) Helper.get(element.getINode(), "href");
-			if (("A".equals(name) || "AREA".equals(name)) && href != null
-					&& href.length() > 0)
-				return true;
-
-		}
-		if (target instanceof Node) {
-			Node node = (Node) target;
-			Node p = node.getParentNode();
-			if (p instanceof IEvalTarget)
-				return Vocabulary.isLink().eval((IEvalTarget) p);
-		}
-		return false;
-	}
-
-	@Override
-	public boolean isCheckbox(IEvalTarget target) {
-		if (target instanceof ElementImpl) {
-			ElementImpl element = (ElementImpl) target;
-			InputType type = element.getInputType();
-			if (type != null)
-				return type.isCheckBox();
-		}
-		return false;
-	}
-
-	@Override
-	public boolean isChecked(IEvalTarget target) {
-		if (target instanceof ElementImpl) {
-			Object obj = Helper.get(((ElementImpl) target).getINode(),
-					"checked");
-			if (obj != null)
-				return (Boolean) obj;
-		}
-		return false;
-	}
-
-	@Override
-	public boolean isRadio(IEvalTarget target) {
-		if (target instanceof ElementImpl) {
-			ElementImpl element = (ElementImpl) target;
-			InputType type = element.getInputType();
-			if (type != null)
-				return type.isRadio();
-		}
-		return false;
-	}
-
-	@Override
-	public boolean isTextbox(IEvalTarget target) {
-		if (target instanceof ElementImpl) {
-			ElementImpl element = (ElementImpl) target;
-			InputType type = element.getInputType();
-			if (type != null)
-				return type.isEdit();
-		}
-		return false;
-	}
-
-	@Override
-	public boolean isPassword(IEvalTarget target) {
-		if (target instanceof ElementImpl) {
-			ElementImpl element = (ElementImpl) target;
-			InputType type = element.getInputType();
-			if (type != null)
-				return type.isPassword();
-		}
-		return false;
-	}
-
-	@Override
-	public boolean isButton(IEvalTarget target) {
-		if (target instanceof ElementImpl) {
-			ElementImpl element = (ElementImpl) target;
-			InputType type = element.getInputType();
-			if (type != null)
-				return type.isButton();
-		}
-		return false;
-	}
-
-	private boolean isInTags(IEvalTarget target, HashSet<String> tags) {
-		if (target instanceof ElementImpl) {
-			ElementImpl element = (ElementImpl) target;
-			String name = element.getNodeName();
-			if (tags.contains(name.intern()))
-				return true;
-		}
-
-		return false;
-	}
-
-	@Override
-	public boolean isListTop(IEvalTarget target) {
-		if (isInTags(target, listTopTags)) {
-			if (target instanceof Element) {
-				Element e = (Element) target;
-				NodeList nl = e.getChildNodes();
-				int count = 0;
-				for (int i = 0; i < nl.getLength(); i++) {
-					Node n = nl.item(i);
-					if (n instanceof IEvalTarget && isListItem((IEvalTarget) n))
-						count++;
-				}
-				if (count > 1)
-					return true;
-			}
-		}
-		return false;
-	}
-
-	@Override
-	public boolean isListItem(IEvalTarget target) {
-		return isListItemJumpPoint(target);
-	}
-
-	@Override
-	public boolean isFileEdit(IEvalTarget target) {
-		if (target instanceof ElementImpl) {
-			ElementImpl element = (ElementImpl) target;
-			InputType type = element.getInputType();
-			if (type != null)
-				return type.isFileEdit();
-		}
-		return false;
-	}
-
-	@Override
-	public boolean isEmbeddedObject(IEvalTarget target) {
-		if (target instanceof ElementImpl) {
-			ElementImpl element = (ElementImpl) target;
-
-			String name = element.getLocalName();
-			if ("EMBED".equals(name) || "OBJECT".equals(name))
-				return true;
-		}
-		return false;
-	}
-
-	@Override
-	public boolean isImage(IEvalTarget target) {
-		if (!(target instanceof ElementImpl))
-			return false;
-
-		ElementImpl element = (ElementImpl) target;
-		String name = element.getLocalName();
-		return "IMG".equals(name);
-	}
-
-	@Override
-	public boolean hasContent(IEvalTarget target) {
-		if (isMultilineEdit(target)) {
-			if (target instanceof Element) {
-				return !hasContent((IEvalTarget) ((Element) target)
-						.getFirstChild());
-			}
-		}
-		if (isInputable(target))
-			return true;
-		if (isListTop(target))
-			return true;
-		return super.hasContent(target);
-	}
-
-	private static final HashSet<String> reducibleElementNames = new HashSet<String>();
-	static {
-		reducibleElementNames.add("FONT".intern());
-		reducibleElementNames.add("BASEFONT".intern());
-		reducibleElementNames.add("S".intern());
-		reducibleElementNames.add("STRIKE".intern());
-		reducibleElementNames.add("U".intern());
-		reducibleElementNames.add("EM".intern());
-		reducibleElementNames.add("STRONG".intern());
-		reducibleElementNames.add("SPAN".intern());
-		reducibleElementNames.add("VAR".intern());
-		reducibleElementNames.add("CODE".intern());
-		reducibleElementNames.add("CITE".intern());
-		reducibleElementNames.add("ABBR".intern());
-		reducibleElementNames.add("ACRONYM".intern());
-		reducibleElementNames.add("Q".intern());
-		reducibleElementNames.add("B".intern());
-		reducibleElementNames.add("BIG".intern());
-		reducibleElementNames.add("I".intern());
-		reducibleElementNames.add("SMALL".intern());
-		reducibleElementNames.add("TT".intern());
-		reducibleElementNames.add("SUB".intern());
-		reducibleElementNames.add("SUP".intern());
-
-		// non official tag
-		reducibleElementNames.add("WBR".intern());
-	}
-
-	@Override
-	public boolean isReducible(IEvalTarget target) {
-		// Might it be included in the rules?
-		// if (Vocabulary.isClickable().eval(target)) return false;
-		if (!(target instanceof ElementImpl))
-			return false;
-		ElementImpl element = (ElementImpl) target;
-		String name = element.getLocalName().intern();
-		return reducibleElementNames.contains(name);
-	}
-
-	@Override
-	public boolean isVisitedLink(IEvalTarget target) {
-		if (!(target instanceof INodeEx))
-			return false;
-		INodeEx nex = (INodeEx) target;
-
-		String url = nex.getLinkURI();
-		if (url == null)
-			return false;
-
-		return ComPlugin.getDefault().getBrowserHistory().isVisited(url);
-	}
-
-	@Override
-	public boolean isHeadingJumpPoint(IEvalTarget target) {
-		return isJumpPoint(target, headingTags);
-	}
-
-	@Override
-	public boolean isListItemJumpPoint(IEvalTarget target) {
-		return isJumpPoint(target, listItemTags);
-	}
-
-	@Override
-	public boolean isBlockJumpPointF(IEvalTarget target) {
-		return isJumpPoint(target, blockTags, 3)
-				|| isJumpPoint2(target, headingTags, 3);
-	}
-
-	@Override
-	public boolean isBlockJumpPointB(IEvalTarget target) {
-		return isJumpPoint(target, blockTags, 3)
-				|| isJumpPoint2(target, headingTags, 3);
-	}
-
-	private boolean isJumpPoint(IEvalTarget target, HashSet<String> tags) {
-		return isJumpPoint(target, tags, 100);
-	}
-
-	private boolean isJumpPoint(IEvalTarget target, HashSet<String> tags,
-			int depth) {
-		if (depth <= 0)
-			return false;
-
-		if (target instanceof Element) {
-			Element element = (Element) target;
-			String name = element.getLocalName();
-			if (tags.contains(name.intern())) {
-				return true;
-			}
-		}
-
-		if (!(target instanceof Node))
-			return false;
-		Node node = (Node) target;
-		Node prev = node.getPreviousSibling();
-		while (prev != null) {
-			if (hasText(prev)) {
-				return false;
-			}
-			prev = prev.getPreviousSibling();
-		}
-
-		Node parent = node.getParentNode();
-		if (parent == null)
-			return false;
-
-		if (parent instanceof IEvalTarget) {
-			return isJumpPoint((IEvalTarget) parent, tags, depth - 1);
-		}
-
-		return false;
-	}
-
-	private boolean isJumpPoint2(IEvalTarget target, HashSet<String> tags,
-			int depth) {
-		if (depth <= 0)
-			return false;
-
-		if (target instanceof Element) {
-			Element element = (Element) target;
-			String name = element.getLocalName();
-			if (tags.contains(name.intern())) {
-				return true;
-			}
-		}
-
-		if (!(target instanceof Node))
-			return false;
-		Node node = (Node) target;
-
-		Node parent = node.getParentNode();
-		if (parent == null)
-			return false;
-
-		if (parent instanceof IEvalTarget) {
-			return isJumpPoint((IEvalTarget) parent, tags, depth - 1);
-		}
-
-		return false;
-	}
-
-	private boolean hasText(Node prev) {
-		if (prev instanceof INodeEx) {
-			INodeEx nex = (INodeEx) prev;
-			if (nex.hasChildNodes()) {
-				NodeList list = nex.getChildNodes();
-				for (int i = 0; i < list.getLength(); i++) {
-					Node cn = list.item(i);
-					if (hasText(cn))
-						return true;
-				}
-			} else {
-				if (nex.extractString().length() > 0) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	@Override
-	public boolean isAccessKey(char key, IEvalTarget node) {
-		if (!(node instanceof INodeEx))
-			return false;
-		INodeEx nex = (INodeEx) node;
-		char c = nex.getAccessKey();
-
-		return c == key;
-	}
-
-	@Override
-	public boolean isReachable(IEvalTarget evalTarget, Node target) {
-		if (!(evalTarget instanceof Node))
-			return false;
-
-		Node node = (Node) evalTarget;
-
-		Node a1 = searchNonReducibleAncestor(node);
-		if (a1 == null)
-			return false;
-		Node a2 = searchNonReducibleAncestor(target);
-		if (a2 == null)
-			return false;
-
-		if (a1.getParentNode() == null)
-			return false;
-		if (a2.getParentNode() == null)
-			return false;
-
-		if (!(a1.getParentNode().isSameNode(a2.getParentNode()))) {
-			return false;
-		} else {
-			if (a1 instanceof IEvalTarget && a2 instanceof IEvalTarget) {
-				IEvalTarget t1 = (IEvalTarget) a1;
-				IEvalTarget t2 = (IEvalTarget) a2;
-				if (isLink(t1) && isLink(t2)) {
-					return true;
-				}
-				if (isButton(t1) && isButton(t2)) {
-					return true;
-				}
-			}
-		}
-
-		Node start = node;
-
-		Node end = target;
-		if (end instanceof Text)
-			end = getPrev(end);
-		if (end == null)
-			return false;
-
-		Node next = getNext(start);
-		while (next != null) {
-			if (!(next instanceof IEvalTarget)) {
-				next = getNext(next);
-				continue;
-			}
-			if ((!Vocabulary.isReducible().eval((IEvalTarget) next)))
-				return false;
-
-			if (next.isSameNode(end))
-				break;
-			next = getNext(next);
-		}
-
-		return true;
-	}
-
-	private Node getPrev(Node node) {
-		Node prev = node.getPreviousSibling();
-		if (prev != null)
-			return prev;
-		return node.getParentNode();
-	}
-
-	private Node getNext(Node node) {
-		Node next = node.getNextSibling();
-		if (next != null)
-			return next;
-		return node.getParentNode();
-	}
-
-	private Node searchNonReducibleAncestor(Node node) {
-		Node child = null;
-		Node parent = node;
-
-		while (parent != null && parent instanceof IEvalTarget
-				&& (parent instanceof Text || isImage((IEvalTarget) parent))
-				|| isReducible((IEvalTarget) parent)) {
-			child = parent;
-			parent = parent.getParentNode();
-		}
-
-		return child;
-	}
-}
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/html/ImageElementImpl.java b/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/html/ImageElementImpl.java
deleted file mode 100644
index 000e21c..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/html/ImageElementImpl.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Daisuke SATO - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.actf.model.dom.dombycom.impl.html;
-
-import org.eclipse.actf.model.dom.dombycom.IImageElement;
-import org.eclipse.actf.model.dom.dombycom.impl.Helper;
-import org.eclipse.actf.model.dom.dombycom.impl.NodeImpl;
-import org.eclipse.actf.util.win32.comclutch.IDispatch;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-@SuppressWarnings("nls")
-public class ImageElementImpl extends HTMLElementImpl implements IImageElement {
-
-	public ImageElementImpl(NodeImpl baseNode, IDispatch inode) {
-		super(baseNode, inode);
-	}
-
-	public boolean hasUsemap() {
-		String usemap = (String) Helper.get(inode, "usemap");
-		return (usemap != null && usemap.length() >= 2);
-	}
-
-	public Element getMap() {
-		String usemap = (String) Helper.get(inode, "usemap");
-		if (usemap == null)
-			return null;
-
-		String name;
-		if (usemap.startsWith("#")) {
-			name = usemap.substring(1);
-		} else {
-			name = usemap;
-		}
-		NodeList nl = getOwnerDocument().getElementsByTagName("MAP");
-		for (int i = 0; i < nl.getLength(); i++) {
-			Node node = nl.item(i);
-			if ("MAP".equals(node.getNodeName())) {
-				Element area = (Element) node;
-				if (name.equals(area.getAttribute("name")))
-					return area;
-			}
-		}
-		return null;
-	}
-}
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/html/SelectElementImpl.java b/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/html/SelectElementImpl.java
deleted file mode 100644
index 63c3b53..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/html/SelectElementImpl.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Daisuke SATO - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.actf.model.dom.dombycom.impl.html;
-
-import java.util.ArrayList;
-
-import org.eclipse.actf.model.dom.dombycom.ISelectElement;
-import org.eclipse.actf.model.dom.dombycom.impl.Helper;
-import org.eclipse.actf.model.dom.dombycom.impl.NodeImpl;
-import org.eclipse.actf.util.win32.comclutch.IDispatch;
-
-@SuppressWarnings("nls")
-public class SelectElementImpl extends HTMLElementImpl implements
-		ISelectElement {
-
-	public SelectElementImpl(NodeImpl baseNode, IDispatch inode) {
-		super(baseNode, inode);
-	}
-
-	public void setSelectedIndices(int[] indices) {
-		int[] prev = getSelectedIndices();
-
-		int length = (Integer) Helper.get(inode, "length");
-		for (int i = 0; i < length; i++) {
-			IDispatch option = (IDispatch) inode.invoke1("item", i);
-			Helper.put(option, "selected", false);
-		}
-
-		for (int i = 0; i < indices.length; i++) {
-			IDispatch option = (IDispatch) inode.invoke1("item", indices[i]);
-			Helper.put(option, "selected", true);
-		}
-
-		if (Helper.hasProperty(inode, "onchange")) {
-			if (prev.length != indices.length) {
-				inode.invoke0("onchange");
-			} else {
-				for (int i = 0; i < prev.length; i++) {
-					if (prev[i] != indices[i]) {
-						inode.invoke0("onchange");
-						break;
-					}
-				}
-			}
-		}
-
-	}
-
-	public int[] getSelectedIndices() {
-		ArrayList<Integer> list = new ArrayList<Integer>();
-		int length = (Integer) Helper.get(inode, "length");
-		for (int i = 0; i < length; i++) {
-			IDispatch option = (IDispatch) inode.invoke1("item", i);
-			boolean selected = (Boolean) Helper.get(option, "selected");
-			if (selected)
-				list.add(i);
-		}
-
-		int[] indices = new int[list.size()];
-		for (int i = 0; i < indices.length; i++)
-			indices[i] = list.get(i);
-		return indices;
-	}
-
-	public int getOptionsCount() {
-		int length = (Integer) Helper.get(inode, "length");
-		return length;
-	}
-
-	public String getOptionTextAt(int index) {
-		IDispatch option = (IDispatch) inode.invoke1("item", index);
-		return (String) Helper.get(option, "text");
-	}
-}
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/html/TextImpl.java b/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/html/TextImpl.java
deleted file mode 100644
index d78629a..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/html/TextImpl.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Hisashi MIYASHITA - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.actf.model.dom.dombycom.impl.html;
-
-import org.eclipse.actf.model.dom.dombycom.IElementEx;
-import org.eclipse.actf.model.dom.dombycom.INodeEx;
-import org.eclipse.actf.model.dom.dombycom.impl.Helper;
-import org.eclipse.actf.model.dom.dombycom.impl.NodeImpl;
-import org.eclipse.actf.util.win32.comclutch.DispatchException;
-import org.eclipse.actf.util.win32.comclutch.IDispatch;
-import org.eclipse.swt.graphics.Rectangle;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Node;
-import org.w3c.dom.Text;
-
-@SuppressWarnings("nls")
-class TextImpl extends CharacterDataImpl implements Text, INodeEx {
-	TextImpl(NodeImpl baseNode, IDispatch inode) {
-		super(baseNode, inode, Node.TEXT_NODE);
-	}
-
-	public Text splitText(int offset) throws DOMException {
-		try {
-			IDispatch r = (IDispatch) inode.invoke1("splitText", Integer
-					.valueOf(offset));
-			if (r == null)
-				return null;
-			return (Text) newNode(r, Node.TEXT_NODE);
-		} catch (DispatchException e) {
-			return null;
-		}
-	}
-
-	public boolean isElementContentWhitespace() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	public String getWholeText() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public Text replaceWholeText(String content) throws DOMException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	// --------------------------------------------------------------------------------
-	// INodeEx interface
-	// --------------------------------------------------------------------------------
-
-	public boolean doClick() {
-		Node parent = getParentNode();
-		if (parent instanceof INodeEx) {
-			return ((INodeEx) parent).doClick();
-		}
-		return false;
-	}
-
-	public boolean highlight() {
-		Node parent = getParentNode();
-		if (parent instanceof INodeEx) {
-			return ((INodeEx) parent).highlight();
-		}
-		return false;
-	}
-
-	public boolean unhighlight() {
-		Node parent = getParentNode();
-		if (parent instanceof INodeEx) {
-			return ((INodeEx) parent).unhighlight();
-		}
-		return false;
-	}
-
-	public String extractString() {
-		String nv = getNodeValue();
-		if (nv == null)
-			return "";
-		nv = Helper.trimHTMLStr(nv);
-
-		Node parent = getParentNode();
-
-		if (!(parent instanceof ElementImpl))
-			return nv;
-
-		if (!"ABBR".equals(parent.getNodeName()) //
-				&& !"ACRONYM".equals(parent.getNodeName()))
-			return nv;
-
-		ElementImpl el = (ElementImpl) parent;
-
-		String title = el.getAttribute("title");
-		if (null != title) {
-			return nv + " (" + title + ")";
-		}
-		return nv;
-	}
-
-	public boolean setFocus() {
-		return false;
-	}
-
-	public Rectangle getLocation() {
-		Node parent = getParentNode();
-		while (parent != null && !(parent instanceof IElementEx)) {
-			parent = parent.getParentNode();
-		}
-		if (parent == null) {
-			return new Rectangle(0, 0, 0, 0);
-		}
-		return ((INodeEx) parent).getLocation();
-	}
-
-	public char getAccessKey() {
-		Node parent = getParentNode();
-
-		if (!(parent instanceof INodeEx))
-			return 0;
-
-		return ((INodeEx) parent).getAccessKey();
-	}
-}
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/html/TitleElementImpl.java b/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/html/TitleElementImpl.java
deleted file mode 100644
index f72b214..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/html/TitleElementImpl.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Kentarou FUKUDA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.dombycom.impl.html;
-
-import org.eclipse.actf.model.dom.dombycom.impl.DocumentImpl;
-import org.eclipse.actf.model.dom.dombycom.impl.Helper;
-import org.eclipse.actf.model.dom.dombycom.impl.NodeImpl;
-import org.eclipse.actf.util.win32.comclutch.IDispatch;
-import org.w3c.dom.html.HTMLTitleElement;
-
-@SuppressWarnings("nls")
-public class TitleElementImpl extends HTMLElementImpl implements
-		HTMLTitleElement {
-
-	private static final String TEXT = "text";
-
-	protected TitleElementImpl(NodeImpl baseNode, IDispatch inode) {
-		super(baseNode, inode);
-	}
-
-	protected TitleElementImpl(DocumentImpl baseDoc, IDispatch inode) {
-		super(baseDoc, inode);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.actf.model.dom.dombycom.impl.NodeImpl#getText()
-	 */
-	@Override
-	public String getText() {
-		String ret = "";
-		ret = (String) Helper.get(inode, TEXT);
-		return ret;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.actf.model.dom.dombycom.impl.NodeImpl#setText(java.lang.String
-	 * )
-	 */
-	@Override
-	public void setText(String text) {
-		Helper.put(inode, TEXT, text);
-	}
-
-}
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/object/MediaObjectImpl.java b/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/object/MediaObjectImpl.java
deleted file mode 100644
index f4ced8e..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/object/MediaObjectImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Hisashi MIYASHITA - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.actf.model.dom.dombycom.impl.object;
-
-import org.eclipse.actf.model.dom.dombycom.AnalyzedResult;
-import org.eclipse.actf.model.dom.dombycom.INodeEx;
-import org.eclipse.actf.model.dom.dombycom.INodeExSound;
-import org.eclipse.actf.model.dom.dombycom.INodeExVideo;
-import org.eclipse.actf.model.dom.dombycom.impl.NodeImpl;
-import org.eclipse.actf.model.dom.dombycom.impl.html.ElementImpl;
-import org.eclipse.actf.util.vocab.AbstractTerms;
-import org.eclipse.actf.util.win32.comclutch.IDispatch;
-
-
-
-
-
-abstract class MediaObjectImpl extends ElementImpl implements INodeExVideo, INodeExSound {
-    @Override
-    public AnalyzedResult analyze(AnalyzedResult ar) {
-        ar.addVideo(this);
-        ar.addSound(this);
-        return ar;
-    }
-
-    public INodeEx getReferenceNode() {
-        return this;
-    }
-
-    @Override
-    public AbstractTerms getTerms() {
-        return MediaObjectTerms.getInstance();
-    }
-
-    protected MediaObjectImpl(NodeImpl baseNode, IDispatch idisp) {
-        super(baseNode, idisp);
-   }
-}
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/object/MediaObjectTerms.java b/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/object/MediaObjectTerms.java
deleted file mode 100644
index fbac4e2..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/object/MediaObjectTerms.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Daisuke SATO - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.actf.model.dom.dombycom.impl.object;
-
-import org.eclipse.actf.util.vocab.AbstractTerms;
-import org.eclipse.actf.util.vocab.IEvalTarget;
-
-
-
-
-class MediaObjectTerms extends AbstractTerms {
-    private static final MediaObjectTerms instance = new MediaObjectTerms();
-
-    @Override
-    public boolean hasContent(IEvalTarget target) {
-        return true;
-    }
-
-    @Override
-    public boolean isMedia(IEvalTarget node) {
-        return true;
-    }
-
-    @Override
-    public boolean isAlterable(IEvalTarget target) {
-        return true;
-    }
-
-    @Override
-    public boolean isValidNode(IEvalTarget target) {
-        return true;
-    }
-
-    @Override
-    public boolean isVisibleNode(IEvalTarget target) {
-        return true;
-    }
-
-    @Override
-    public boolean isEmbeddedObject(IEvalTarget target) {
-        return true;
-    }
-
-    static MediaObjectTerms getInstance() {
-        return instance;
-    }
-
-}
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/object/ObjectElementFactory.java b/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/object/ObjectElementFactory.java
deleted file mode 100644
index 7a137d2..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/object/ObjectElementFactory.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Daisuke SATO - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.actf.model.dom.dombycom.impl.object;
-
-import org.eclipse.actf.model.dom.dombycom.IObjectElementFactory;
-import org.eclipse.actf.model.dom.dombycom.impl.Helper;
-import org.eclipse.actf.model.dom.dombycom.impl.NodeImpl;
-import org.eclipse.actf.util.win32.comclutch.DispatchException;
-import org.eclipse.actf.util.win32.comclutch.IDispatch;
-
-@SuppressWarnings("nls")
-public class ObjectElementFactory {
-
-	private static IObjectElementFactory[] factories = ObjectElementFactoryExtension
-			.getObjectElementFactories();
-
-	public static NodeImpl create(NodeImpl base, IDispatch inode) {
-		for (IObjectElementFactory factory : factories) {
-			NodeImpl newNode = factory.createTopNode(base, inode);
-			if (newNode != null)
-				return newNode;
-		}
-
-		Object controls = Helper.get(inode, "controls");
-		if (controls instanceof IDispatch) {
-			return new WMPNodeImpl(base, inode, (IDispatch) controls);
-		}
-
-		Object clientID = Helper.get(inode, "ClientID");
-		if (clientID != null) {
-			return new WMP64NodeImpl(base, inode);
-		}
-
-		try {
-			Object qtVersion = inode.invoke0("GetQuickTimeVersion");
-			if (qtVersion != null) {
-				return new QTNodeImpl(base, inode);
-			}
-		} catch (DispatchException e) {
-		}
-
-		try {
-			Object rpVersion = inode.invoke0("GetVersionInfo");
-			if (rpVersion != null) {
-				return new RPNodeImpl(base, inode);
-			}
-		} catch (DispatchException e) {
-		}
-
-		return null;
-	}
-
-}
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/object/ObjectElementFactoryExtension.java b/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/object/ObjectElementFactoryExtension.java
deleted file mode 100644
index e5e87a6..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/object/ObjectElementFactoryExtension.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Kentarou FUKUDA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.dombycom.impl.object;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.actf.model.dom.dombycom.IObjectElementFactory;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.Platform;
-
-@SuppressWarnings("nls")
-public class ObjectElementFactoryExtension {
-	private static final String EXTENSION_NAME = "elementFactory";
-
-	private static final String OBJECT_ELEMENT_FACTORY = "objectElementFactory";
-
-	private static final String ATTR_IMPL = "implementations";
-
-	private static ObjectElementFactoryExtension[] extensions;
-
-	private static IObjectElementFactory[] factories = null;
-
-	public static IObjectElementFactory[] getObjectElementFactories() {
-		if (factories != null) {
-			return factories;
-		}
-
-		ObjectElementFactoryExtension[] tmpExtensions = getExtensions();
-		ArrayList<IObjectElementFactory> tmpList = new ArrayList<IObjectElementFactory>();
-		if (tmpExtensions != null) {
-			for (int i = 0; i < tmpExtensions.length; i++) {
-				IObjectElementFactory tmpFactory = tmpExtensions[i].getFactory();
-				if (tmpFactory != null) {
-					tmpList.add(tmpFactory);
-				}
-			}
-		}
-		factories = new IObjectElementFactory[tmpList.size()];
-		tmpList.toArray(factories);
-		return factories;
-	}
-
-	private static ObjectElementFactoryExtension[] getExtensions() {
-		if (extensions != null)
-			return extensions;
-
-		IExtension[] tmpExtensions = Platform.getExtensionRegistry()
-				.getExtensionPoint("org.eclipse.actf.model.dom.dombycom", EXTENSION_NAME)
-				.getExtensions();
-
-		List<ObjectElementFactoryExtension> l = new ArrayList<ObjectElementFactoryExtension>();
-		for (int i = 0; i < tmpExtensions.length; i++) {
-			IConfigurationElement[] configElements = tmpExtensions[i]
-					.getConfigurationElements();
-			for (int j = 0; j < configElements.length; j++) {
-				ObjectElementFactoryExtension ex = parseExtension(configElements[j]);
-				if (ex != null) {
-					l.add(ex);
-				}
-			}
-		}
-		extensions = l.toArray(new ObjectElementFactoryExtension[l.size()]);
-		return extensions;
-	}
-
-	private static ObjectElementFactoryExtension parseExtension(
-			IConfigurationElement configElement) {
-		if (!configElement.getName().equals(OBJECT_ELEMENT_FACTORY)) {
-			return null;
-		}
-		try {
-			return new ObjectElementFactoryExtension(configElement);
-		} catch (Exception e) {
-		}
-		return null;
-	}
-
-	private IObjectElementFactory factory = null;
-
-	private ObjectElementFactoryExtension(IConfigurationElement configElement) {
-		try {
-			this.factory = (IObjectElementFactory) configElement
-					.createExecutableExtension(ATTR_IMPL);
-		} catch (Exception e) {
-		}
-
-	}
-
-	private IObjectElementFactory getFactory() {
-		return this.factory;
-	}
-	
-
-}
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/object/QTNodeImpl.java b/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/object/QTNodeImpl.java
deleted file mode 100644
index 838ead4..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/object/QTNodeImpl.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Daisuke SATO - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.actf.model.dom.dombycom.impl.object;
-
-import org.eclipse.actf.model.dom.dombycom.impl.NodeImpl;
-import org.eclipse.actf.util.win32.comclutch.DispatchException;
-import org.eclipse.actf.util.win32.comclutch.IDispatch;
-
-@SuppressWarnings("nls")
-class QTNodeImpl extends MediaObjectImpl {
-
-	boolean pause = false;
-
-	private VideoState currentState = VideoState.STATE_UNKNOWN;
-
-	QTNodeImpl(NodeImpl baseNode, IDispatch inode) {
-		super(baseNode, inode);
-	}
-
-	private Object exec0(String cmd) {
-		try {
-			return inode.invoke0(cmd);
-		} catch (DispatchException e) {
-		}
-		return null;
-	}
-
-	private Object exec1(String cmd, Object obj) {
-		try {
-			return inode.invoke1(cmd, obj);
-		} catch (DispatchException e) {
-		}
-		return null;
-	}
-
-	public boolean getMuteState() {
-		Object bool = exec0("GetMute");
-		if (bool != null)
-			return ((Integer) bool).intValue() != 0;
-		else
-			return false;
-	}
-
-	public int getVolume() {
-		// range is 0-256
-		// mapping to 0-1000
-		Object volume = exec0("GetVolume");
-
-		if (volume != null)
-			return ((Integer) volume).intValue() * 1000 / 256;
-		else
-			return 0;
-	}
-
-	public boolean muteMedia(boolean flag) {
-		exec1("setMute", Boolean.valueOf(flag));
-		return true;
-	}
-
-	public boolean setVolume(int val) {
-		int volume = val * 256 / 1000;
-		exec1("SetVolume", volume);
-		return true;
-	}
-
-	public boolean fastForward() {
-		// TODO
-		return false;
-	}
-
-	public boolean fastReverse() {
-		exec0("Rewind");
-		return true;
-	}
-
-	public double getCurrentPosition() {
-		Object time = exec0("GetTime");
-		Object scale = exec0("GetTimeScale");
-
-		if (time != null)
-			return ((Integer) time).doubleValue()
-					/ ((Integer) scale).doubleValue();
-		else
-			return 0;
-	}
-
-	public VideoState getCurrentState() {
-		return currentState;
-	}
-
-	public double getTotalLength() {
-		// TODO Auto-generated method stub
-		return 0;
-	}
-
-	public boolean nextTrack() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	public boolean pauseMedia() {
-		if (currentState == VideoState.STATE_PAUSE)
-			return playMedia();
-		exec0("Stop");
-		currentState = VideoState.STATE_PAUSE;
-		return true;
-	}
-
-	public boolean playMedia() {
-		exec0("Play");
-		currentState = VideoState.STATE_PLAY;
-		return true;
-	}
-
-	public boolean previousTrack() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	public boolean stopMedia() {
-		exec0("Stop");
-		exec1("SetTime", 0);
-		currentState = VideoState.STATE_STOP;
-		return true;
-	}
-}
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/object/RPNodeImpl.java b/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/object/RPNodeImpl.java
deleted file mode 100644
index 73fff5f..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/object/RPNodeImpl.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Daisuke SATO - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.actf.model.dom.dombycom.impl.object;
-
-import org.eclipse.actf.model.dom.dombycom.impl.NodeImpl;
-import org.eclipse.actf.util.win32.comclutch.DispatchException;
-import org.eclipse.actf.util.win32.comclutch.IDispatch;
-
-@SuppressWarnings("nls")
-class RPNodeImpl extends MediaObjectImpl {
-
-	// Holding internal state because Real Player's state
-	// is not changed right after executing command
-
-	private boolean pause = false;
-
-	private boolean play = false;
-
-	private boolean stop = false;
-
-	private boolean mute = false;
-
-	RPNodeImpl(NodeImpl baseNode, IDispatch inode) {
-		super(baseNode, inode);
-	}
-
-	private Object exec0(String cmd) {
-		try {
-			return inode.invoke0(cmd);
-		} catch (DispatchException e) {
-		}
-		return null;
-	}
-
-	private Object exec1(String cmd, Object obj) {
-		try {
-			return inode.invoke1(cmd, obj);
-		} catch (DispatchException e) {
-		}
-		return null;
-	}
-
-	public boolean getMuteState() {
-		Object bool = exec0("GetMute");
-
-		if (mute) {
-			mute = false;
-			return true;
-		}
-
-		if (bool != null)
-			return ((Boolean) bool).booleanValue();
-		else
-			return false;
-	}
-
-	public int getVolume() {
-		// range is 0-100
-		// mapping to 0-1000
-		Object volume = exec0("GetVolume");
-
-		if (volume != null)
-			return ((Short) volume).intValue() * 1000 / 100;
-		else
-			return 0;
-	}
-
-	public boolean muteMedia(boolean flag) {
-		// cannot mute media with "true", but can mute media with "1"
-		// [ exec1("SetMute", true); ] x
-		// [ exec1("SetMute", 1); ] o
-		// [ exec1("SetMute", false);] o
-
-		exec1("SetMute", flag ? 1 : 0);
-		mute = true;
-		return true;
-	}
-
-	public boolean setVolume(int val) {
-		int volume = val * 100 / 1000;
-		exec1("SetVolume", volume);
-		return true;
-	}
-
-	public boolean fastForward() {
-		// TODO
-		return false;
-	}
-
-	public boolean fastReverse() {
-		exec0("Rewind");
-		return true;
-	}
-
-	public double getCurrentPosition() {
-		Object time = exec0("GetPosition");
-
-		if (time != null)
-			return ((Integer) time).doubleValue() / 1000;
-		else
-			return 0;
-	}
-
-	public VideoState getCurrentState() {
-		Object state = exec0("GetPlayState");
-
-		if (pause) {
-			pause = play = stop = false;
-			return VideoState.STATE_PAUSE;
-		}
-		if (play) {
-			pause = play = stop = false;
-			return VideoState.STATE_PLAY;
-		}
-		if (stop) {
-			pause = play = stop = false;
-			return VideoState.STATE_STOP;
-		}
-
-		if (state != null) {
-			switch (((Integer) state).intValue()) {
-			case 0:
-				return VideoState.STATE_STOP;
-			case 1:
-			case 2:
-				return VideoState.STATE_WAITING;
-			case 3:
-				return VideoState.STATE_PLAY;
-			case 4:
-				return VideoState.STATE_PAUSE;
-			case 5:
-				return VideoState.STATE_WAITING;
-			}
-		}
-		return VideoState.STATE_UNKNOWN;
-	}
-
-	public double getTotalLength() {
-		// TODO Auto-generated method stub
-		return 0;
-	}
-
-	public boolean nextTrack() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	public boolean pauseMedia() {
-		if (getCurrentState() == VideoState.STATE_PAUSE)
-			return playMedia();
-		exec0("DoPause");
-		pause = true;
-		return true;
-	}
-
-	public boolean playMedia() {
-		exec0("DoPlay");
-		play = true;
-		return true;
-	}
-
-	public boolean previousTrack() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	public boolean stopMedia() {
-		exec0("DoStop");
-		stop = true;
-		return true;
-	}
-}
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/object/WMP64NodeImpl.java b/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/object/WMP64NodeImpl.java
deleted file mode 100644
index d9c24ce..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/object/WMP64NodeImpl.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Hisashi MIYASHITA - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.actf.model.dom.dombycom.impl.object;
-
-import org.eclipse.actf.model.dom.dombycom.INodeExSound;
-import org.eclipse.actf.model.dom.dombycom.impl.Helper;
-import org.eclipse.actf.model.dom.dombycom.impl.NodeImpl;
-import org.eclipse.actf.util.win32.comclutch.DispatchException;
-import org.eclipse.actf.util.win32.comclutch.IDispatch;
-
-@SuppressWarnings("nls")
-class WMP64NodeImpl extends MediaObjectImpl {
-	// This flag is somewhat a workaround.
-	// Even if we put "Mute" property to "true",
-	// it does not affect the value to be obtained.
-	// Therefore, we remember the mute state by ourselves.
-	private boolean muteState;
-
-	WMP64NodeImpl(NodeImpl baseNode, IDispatch idisp) {
-		super(baseNode, idisp);
-	}
-
-	private boolean execControls(String cmd) {
-		try {
-			inode.invoke0(cmd);
-			return true;
-		} catch (DispatchException e) {
-		}
-		return false;
-	}
-
-	private boolean putSettings(String prop, Object val) {
-		try {
-			inode.put(prop, val);
-			return true;
-		} catch (DispatchException e) {
-		}
-		return false;
-	}
-
-	private Object getSettings(String prop) {
-		return Helper.get(inode, prop);
-	}
-
-	public boolean fastForward() {
-		return execControls("fastForward");
-	}
-
-	public boolean fastReverse() {
-		return execControls("fastReverse");
-	}
-
-	public double getCurrentPosition() {
-		Object o = Helper.get(inode, "currentPosition");
-		if (o instanceof Double) {
-			return ((Double) o).doubleValue();
-		} else if (o instanceof Float) {
-			return ((Float) o).floatValue();
-		} else if (o instanceof Integer) {
-			return ((Integer) o).intValue();
-		}
-		return 0;
-	}
-
-	public double getTotalLength() {
-		return -1;
-	}
-
-	public boolean nextTrack() {
-		return execControls("next");
-	}
-
-	public boolean pauseMedia() {
-		return execControls("pause");
-	}
-
-	public boolean playMedia() {
-		return execControls("play");
-	}
-
-	public boolean previousTrack() {
-		return execControls("previous");
-	}
-
-	public boolean stopMedia() {
-		return execControls("stop");
-	}
-
-	public int getVolume() {
-		Object o = getSettings("Volume");
-		if (!(o instanceof Integer))
-			return -1;
-		int vol = ((Integer) o).intValue();
-		// WMP64 volume range is 0 -- -10000. Default is -600. We rescale it to
-		// 0 -- -2000
-		if (vol < -2000) {
-			return INodeExSound.VOLUME_MIN;
-		}
-		return (((vol + 2000)
-				* (INodeExSound.VOLUME_MAX - INodeExSound.VOLUME_MIN) / 2000) + INodeExSound.VOLUME_MIN);
-	}
-
-	public boolean muteMedia(boolean flag) {
-		if (putSettings("Mute", flag)) {
-			muteState = flag;
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-	public boolean getMuteState() {
-		Object o = getSettings("Mute");
-		if (!(o instanceof Boolean))
-			return false;
-		return ((Boolean) o).booleanValue() || muteState;
-	}
-
-	public boolean setVolume(int val) {
-		// First, scale our volume range to 2000 -- 0;
-		val = (((val - INodeExSound.VOLUME_MIN) * 2000) / (INodeExSound.VOLUME_MAX - INodeExSound.VOLUME_MIN));
-		if (val == 0) {
-			val = -10000;
-		} else {
-			val -= 2000;
-		}
-		return putSettings("Volume", Integer.valueOf(val));
-	}
-
-	public VideoState getCurrentState() {
-		Object o = Helper.get(inode, "PlayState");
-		if (o instanceof Integer) {
-			int wmpst = (Integer) o;
-			switch (wmpst) {
-			case 0:
-				return VideoState.STATE_STOP;
-			case 1:
-				return VideoState.STATE_PAUSE;
-			case 2:
-				return VideoState.STATE_PLAY;
-			case 3:
-				return VideoState.STATE_WAITING;
-			case 4:
-			case 6:
-				return VideoState.STATE_FASTFORWARD;
-			case 5:
-			case 7:
-				return VideoState.STATE_FASTREVERSE;
-			default:
-				return VideoState.STATE_STOP;
-			}
-		} else {
-			return VideoState.STATE_UNKNOWN;
-		}
-	}
-}
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/object/WMPNodeImpl.java b/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/object/WMPNodeImpl.java
deleted file mode 100644
index 1bb1544..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/impl/object/WMPNodeImpl.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Hisashi MIYASHITA - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.actf.model.dom.dombycom.impl.object;
-
-import org.eclipse.actf.model.dom.dombycom.INodeExSound;
-import org.eclipse.actf.model.dom.dombycom.impl.Helper;
-import org.eclipse.actf.model.dom.dombycom.impl.NodeImpl;
-import org.eclipse.actf.util.win32.comclutch.DispatchException;
-import org.eclipse.actf.util.win32.comclutch.IDispatch;
-
-@SuppressWarnings("nls")
-class WMPNodeImpl extends MediaObjectImpl {
-	private final IDispatch controls;
-	private final IDispatch settings;
-
-	WMPNodeImpl(NodeImpl baseNode, IDispatch idisp, IDispatch controls) {
-		super(baseNode, idisp);
-		this.controls = controls;
-		Object o = Helper.get(idisp, "settings");
-		if (o instanceof IDispatch) {
-			this.settings = (IDispatch) o;
-		} else {
-			this.settings = null;
-		}
-	}
-
-	private boolean execControls(String cmd) {
-		try {
-			controls.invoke0(cmd);
-			return true;
-		} catch (DispatchException e) {
-		}
-		return false;
-	}
-
-	private boolean putSettings(String prop, Object val) {
-		if (settings == null)
-			return false;
-		try {
-			settings.put(prop, val);
-			return true;
-		} catch (DispatchException e) {
-		}
-		return false;
-	}
-
-	private Object getSettings(String prop) {
-		if (settings == null)
-			return null;
-		return Helper.get(settings, prop);
-	}
-
-	public boolean fastForward() {
-		return execControls("fastForward");
-	}
-
-	public boolean fastReverse() {
-		return execControls("fastReverse");
-	}
-
-	public double getCurrentPosition() {
-		Object o = Helper.get(controls, "currentPosition");
-		if (o instanceof Double) {
-			return ((Double) o).doubleValue();
-		} else if (o instanceof Float) {
-			return ((Float) o).floatValue();
-		} else if (o instanceof Integer) {
-			return ((Integer) o).intValue();
-		}
-		return 0;
-	}
-
-	public double getTotalLength() {
-		return -1;
-	}
-
-	public boolean nextTrack() {
-		return execControls("next");
-	}
-
-	public boolean pauseMedia() {
-		return execControls("pause");
-	}
-
-	public boolean playMedia() {
-		return execControls("play");
-	}
-
-	public boolean previousTrack() {
-		return execControls("previous");
-	}
-
-	public boolean stopMedia() {
-		return execControls("stop");
-	}
-
-	public int getVolume() {
-		Object o = getSettings("volume");
-		if (!(o instanceof Integer))
-			return -1;
-		int vol = ((Integer) o).intValue();
-		return ((vol * ((INodeExSound.VOLUME_MAX - INodeExSound.VOLUME_MIN) / 100)) + INodeExSound.VOLUME_MIN);
-	}
-
-	public boolean muteMedia(boolean flag) {
-		return putSettings("mute", flag);
-	}
-
-	public boolean setVolume(int val) {
-		val = (((val - INodeExSound.VOLUME_MIN) * 100) / (INodeExSound.VOLUME_MAX - INodeExSound.VOLUME_MIN));
-		return putSettings("volume", Integer.valueOf(val));
-	}
-
-	public VideoState getCurrentState() {
-		Object o = Helper.get(inode, "playState");
-		if (o instanceof Integer) {
-			int wmpst = (Integer) o;
-			switch (wmpst) {
-			case 0:
-				return VideoState.STATE_UNKNOWN;
-			case 1:
-				return VideoState.STATE_STOP;
-			case 2:
-				return VideoState.STATE_PAUSE;
-			case 3:
-				return VideoState.STATE_PLAY;
-			case 4:
-				return VideoState.STATE_FASTFORWARD;
-			case 5:
-				return VideoState.STATE_FASTREVERSE;
-			case 6:
-			case 7:
-				return VideoState.STATE_WAITING;
-			default:
-				return VideoState.STATE_STOP;
-			}
-		} else {
-			return VideoState.STATE_UNKNOWN;
-		}
-	}
-
-	public boolean getMuteState() {
-		Object o = getSettings("mute");
-		if (!(o instanceof Boolean))
-			return false;
-		return ((Boolean) o).booleanValue();
-	}
-}
diff --git a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/package-info.java b/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/package-info.java
deleted file mode 100644
index b22f9a4..0000000
--- a/plugins/org.eclipse.actf.model.dom.dombycom/src/org/eclipse/actf/model/dom/dombycom/package-info.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Kentarou FUKUDA - initial API and implementation
- *******************************************************************************/
-
-/**
- * This package contains utilities to access DOM information via the COM wrapper. 
- */
-package org.eclipse.actf.model.dom.dombycom;
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/.classpath b/plugins/org.eclipse.actf.model.dom.odf/.classpath
deleted file mode 100644
index 304e861..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.actf.model.dom.odf/.cvsignore b/plugins/org.eclipse.actf.model.dom.odf/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/plugins/org.eclipse.actf.model.dom.odf/.project b/plugins/org.eclipse.actf.model.dom.odf/.project
deleted file mode 100644
index bc6bd7f..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.actf.model.dom.odf</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.actf.model.dom.odf/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.actf.model.dom.odf/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 06ef8be..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Tue Jan 06 15:30:08 JST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/plugins/org.eclipse.actf.model.dom.odf/META-INF/MANIFEST.MF b/plugins/org.eclipse.actf.model.dom.odf/META-INF/MANIFEST.MF
deleted file mode 100644
index a7a6728..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,33 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: ACTF ODF Model Plug-in (Incubation)
-Bundle-SymbolicName: org.eclipse.actf.model.dom.odf
-Bundle-Version: 0.7.1.qualifier
-Bundle-Vendor: Eclipse.org
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.actf.core
-Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.actf.model.dom.odf,
- org.eclipse.actf.model.dom.odf.anim,
- org.eclipse.actf.model.dom.odf.base,
- org.eclipse.actf.model.dom.odf.chart,
- org.eclipse.actf.model.dom.odf.content,
- org.eclipse.actf.model.dom.odf.dr3d,
- org.eclipse.actf.model.dom.odf.draw,
- org.eclipse.actf.model.dom.odf.form,
- org.eclipse.actf.model.dom.odf.format,
- org.eclipse.actf.model.dom.odf.manifest,
- org.eclipse.actf.model.dom.odf.number,
- org.eclipse.actf.model.dom.odf.office,
- org.eclipse.actf.model.dom.odf.presentation,
- org.eclipse.actf.model.dom.odf.range,
- org.eclipse.actf.model.dom.odf.style,
- org.eclipse.actf.model.dom.odf.svg,
- org.eclipse.actf.model.dom.odf.table,
- org.eclipse.actf.model.dom.odf.text,
- org.eclipse.actf.model.dom.odf.util,
- org.eclipse.actf.model.dom.odf.util.accessibility,
- org.eclipse.actf.model.dom.odf.util.converter,
- org.eclipse.actf.model.dom.odf.xlink
-Bundle-Activator: org.eclipse.actf.model.internal.dom.odf.OdfPlugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.actf.model.dom.odf/about.html b/plugins/org.eclipse.actf.model.dom.odf/about.html
deleted file mode 100644
index 481dbcf..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/about.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June 5, 2006</p>	
-<h3>License</h3>
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  
-Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor&rsquo;s license 
-that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/build.properties b/plugins/org.eclipse.actf.model.dom.odf/build.properties
deleted file mode 100644
index 4410ae9..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/build.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-###############################################################################
-# Copyright (c) 2007, 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = META-INF/,\
-               about.html,\
-               .
-source.. = src/
-output.. = bin/
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/ODFConstants.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/ODFConstants.java
deleted file mode 100644
index bc00714..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/ODFConstants.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf;
-
-/**
- * ODFConstants defines the constant values used by ODF DOM API
- */
-@SuppressWarnings("nls")
-public final class ODFConstants {
-	public enum ContentType {
-		WRITE, SPREADSHEET, PRESENTATION, DRAW, CHART, NONE
-	}
-
-	public static final String ODT_SUFFIX = ".odt";
-
-	public static final String ODS_SUFFIX = ".ods";
-
-	public static final String ODP_SUFFIX = ".odp";
-
-	public static final String ODF_MANIFEST_DIR = "META-INF";
-
-	public static final String ODF_CONTENT_FILENAME = "content.xml";
-
-	public static final String ODF_STYLE_FILENAME = "styles.xml";
-
-	public static final String ODF_MANIFEST_FILENAME = ODF_MANIFEST_DIR
-			+ System.getProperty("file.separator") + "manifest.xml";
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/ODFException.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/ODFException.java
deleted file mode 100644
index ba5f62f..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/ODFException.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf;
-
-/**
- * When a ODF parser meets an unexpected and unrecoverable error, ODFException is thrown
- */
-public class ODFException extends Exception {
-	private static final long serialVersionUID = -5189990975068451718L;
-
-	/**
-	 * 
-	 */
-	public ODFException() {
-		super();
-	}
-
-	/**
-	 * @param message
-	 */
-	public ODFException(String message) {
-		super(message);
-	}
-
-	/**
-	 * @param message
-	 * @param cause
-	 */
-	public ODFException(String message, Throwable cause) {
-		super(message, cause);
-	}
-
-	/**
-	 * @param cause
-	 */
-	public ODFException(Throwable cause) {
-		super(cause);
-	}
-
-}
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/ODFParser.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/ODFParser.java
deleted file mode 100644
index 867c8f8..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/ODFParser.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.eclipse.actf.model.dom.odf.base.ODFDocument;
-import org.eclipse.actf.model.dom.odf.base.ODFNode;
-import org.eclipse.actf.model.dom.odf.base.impl.ODFDocumentImpl;
-import org.eclipse.actf.util.FileUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-/**
- * ODFParser is used when parsing ODF documents.
- */
-public class ODFParser {
-
-	private InputStream getFileInputStream(String odfName, String fileName) {
-		URL url = null;
-		try {
-			url = new URL(odfName);
-		} catch (MalformedURLException e) {
-		}
-
-		ZipFile zipFile = null;
-		ZipEntry zipEntry = null;
-		try {
-			if (url != null) {
-				zipFile = new ZipFile(new File(url.toURI()));
-			} else {
-				zipFile = new ZipFile(odfName);
-			}
-			String zipFileName = fileName.replaceAll("\\\\", "/"); //$NON-NLS-1$ //$NON-NLS-2$
-			zipEntry = zipFile.getEntry(zipFileName);
-		} catch (IOException e) {
-			e.printStackTrace();
-		} catch (URISyntaxException e) {
-			e.printStackTrace();
-		}
-
-		InputStream is = null;
-		if (zipEntry != null) {
-			try {
-				is = zipFile.getInputStream(zipEntry);
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-		}
-		return is;
-	}
-
-	private void createODFNode(Node parent, ODFDocument odfDoc,
-			ODFNode odfNodeParent) {
-		if (parent instanceof Element) {
-			NamedNodeMap attrs = ((Element) parent).getAttributes();
-			if ((attrs != null) && (attrs.getLength() > 0)) {
-				for (int i = 0; i < attrs.getLength(); i++) {
-					((ODFDocumentImpl) odfDoc).getODFNode(attrs.item(i));
-				}
-			}
-		}
-
-		NodeList nl = parent.getChildNodes();
-		if ((nl != null) && (nl.getLength() != 0)) {
-			for (int i = 0; i < nl.getLength(); i++) {
-				Node child = nl.item(i);
-
-				ODFNode odfChild = ((ODFDocumentImpl) odfDoc).getODFNode(child);
-				createODFNode(child, odfDoc, odfChild);
-			}
-		}
-	}
-
-	private ODFDocument parse(InputSource is) {
-		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-		factory.setNamespaceAware(true);
-
-		Document document = null;
-		try {
-			DocumentBuilder documentBuilder = factory.newDocumentBuilder();
-			document = documentBuilder.parse(is);
-		} catch (ParserConfigurationException e) {
-		} catch (SAXException e) {
-		} catch (IOException e) {
-		}
-		if (document == null)
-			return null;
-
-		Node root = document.getDocumentElement();
-		ODFDocument odfDoc = new ODFDocumentImpl(document);
-		ODFNode odfDocRoot = (ODFNode) odfDoc.getDocumentElement();
-		createODFNode(root, odfDoc, odfDocRoot);
-
-		return odfDoc;
-	}
-
-	/**
-	 * Parses a ODF document and return document. 
-	 *
-	 * @param odfName
-	 *            file path of ODF document to parse
-	 * @param xmlName
-	 *            XML file name compressed in ODF file
-	 * @return Document.
-	 */	
-	public ODFDocument getDocument(String odfName, String xmlName) {
-		ODFDocument odfDoc = null;
-		try {
-			InputStream is = getFileInputStream(odfName, xmlName);
-			if (is != null) {
-				odfDoc = parse(new InputSource(is));
-				is.close();
-			}
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-
-		return odfDoc;
-	}
-
-	/**
-	 * Parses a ODF document and return document interface of "content.xml". 
-	 *
-	 * @param odfName
-	 *            file path of ODF document to parse
-	 * @return Document.
-	 */	
-	public ODFDocument getDocument(String odfName) {
-		ODFDocument contentDoc = getDocument(odfName,
-				ODFConstants.ODF_CONTENT_FILENAME);
-		ODFDocument styleDoc = getDocument(odfName,
-				ODFConstants.ODF_STYLE_FILENAME);
-
-		if (contentDoc != null) {
-			contentDoc.setStyleDocument(styleDoc);
-			contentDoc.setURL(odfName);
-		}
-
-		return contentDoc;
-	}
-
-	/**
-	 * Returns file name list compressed in ODF document. 
-	 *
-	 * @param odfName
-	 *            file path of ODF document to parse
-	 * @return file name list.
-	 */		
-	public String[] getFileEntries(String odfName) {
-		ZipFile zipFile = null;
-
-		URL url = null;
-		try {
-			url = new URL(odfName);
-		} catch (MalformedURLException e) {
-		}
-
-		try {
-			if (url != null) {
-				zipFile = new ZipFile(url.getPath());
-			} else {
-				zipFile = new ZipFile(odfName);
-			}
-			Enumeration<? extends ZipEntry> entries = zipFile.entries();
-			List<String> list = new ArrayList<String>();
-			while (entries.hasMoreElements()) {
-				ZipEntry entry = entries.nextElement();
-				String name = entry.getName();
-				list.add(name);
-			}
-			return list.toArray(new String[list.size()]);
-		} catch (IOException e1) {
-			e1.printStackTrace();
-		}
-		return null;
-	}
-
-	/**
-	 * Extract and copy file compressed in ODF document. 
-	 *
-	 * @param odfName
-	 *            file path of ODF document to parse
-	 * @param entry
-	 *            file name compressed in ODF document
-	 * @param outputFileName
-	 *            file path to copy file extracted from ODF document
-	 */			
-	public void copyFile(String odfName, String entry, String outputFileName) {
-		InputStream is = getFileInputStream(odfName, entry);
-		FileUtils.saveToFile(is, outputFileName, true);
-	}
-}
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/anim/AnimConstants.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/anim/AnimConstants.java
deleted file mode 100644
index 99bd297..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/anim/AnimConstants.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.anim;
-
-/**
- * AnimConstants defines the constant values used by animation namespace of ODF DOM API
- */
-@SuppressWarnings("nls")
-public final class AnimConstants {
-	static public final String ANIM_NAMESPACE_URI = "urn:oasis:names:tc:opendocument:xmlns:animation:1.0";
-
-	static public final String ELEMENT_PAR = "par";
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/anim/package-info.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/anim/package-info.java
deleted file mode 100644
index 6eb158d..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/anim/package-info.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Kentarou FUKUDA - initial API and implementation
- *******************************************************************************/
-
-/**
- * This package contains interfaces and constants of ODF anim namespace.
- * Anim namespace contains elements and attributes that describe animation content.
- */
-package org.eclipse.actf.model.dom.odf.anim;
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/ContentBaseElement.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/ContentBaseElement.java
deleted file mode 100644
index 765ed23..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/ContentBaseElement.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.base;
-
-import org.eclipse.actf.model.dom.odf.ODFConstants.ContentType;
-import org.eclipse.actf.model.dom.odf.range.IContentRange;
-
-/**
- * ODF elements that has &lt;office:body&gt; element as parent should implement this interface.
- */
-public interface ContentBaseElement extends ODFElement {
-	/**
-	 * Returns content type defined in ODFConstants.ContentType.
-	 * 
-	 * @return ODF document type
-	 */
-	public ContentType getContentType();
-
-	/**
-	 * Returns newly created range class.
-	 * 
-	 * @return new range instance
-	 */
-	IContentRange createRange();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/DrawingObjectBaseElement.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/DrawingObjectBaseElement.java
deleted file mode 100644
index ce64793..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/DrawingObjectBaseElement.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.base;
-
-import org.eclipse.actf.model.dom.odf.svg.DescElement;
-import org.eclipse.actf.model.dom.odf.svg.TitleElement;
-
-/**
- * All graphics ODF elements should implement this interface.
- */
-public interface DrawingObjectBaseElement extends ODFElement {
-	/**
-	 * Return &lt;svg:title&gt; element
-	 * 
-	 * @return TitleElement
-	 */	
-	public TitleElement getSVGTitleElement();
-
-	/**
-	 * Return &lt;svg:desc&gt; element
-	 * 
-	 * @return DescElement
-	 */	
-	public DescElement getSVGDescElement();
-
-	/**
-	 * Return short description element
-	 * &lt;svg:desc&gt; element for ODF 1.0
-	 * &lt;svg:title&gt; element for ODF later than 1.0
-	 * 
-	 * @return ODFElement
-	 */		
-	public ODFElement getShortDescElement();
-
-	/**
-	 * Return long description element
-	 * &lt;svg:desc&gt; element for ODF later than 1.0
-	 * For ODF 1.0, this function always returns null
-	 * 
-	 * @return ODFElement
-	 */	
-	public ODFElement getLongDescElement();
-
-	/**
-	 * Return short description element
-	 * &lt;svg:desc&gt; element for ODF 1.0
-	 * &lt;svg:title&gt; element for ODF later than 1.0
-	 *
-	 * @param version
-	 *            version of ODF
-	 * @return ODFElement
-	 */		
-	public ODFElement getShortDescElement(double version);
-
-	/**
-	 * Return long description element
-	 * &lt;svg:desc&gt; element for ODF later than 1.0
-	 * For ODF 1.0, this function always returns null
-	 * 
-	 * @param version
-	 *            version of ODF
-	 * @return ODFElement
-	 */	
-	public ODFElement getLongDescElement(double version);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/DrawingObjectElement.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/DrawingObjectElement.java
deleted file mode 100644
index bc06598..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/DrawingObjectElement.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.base;
-
-import org.eclipse.actf.model.dom.odf.draw.TextBoxElement;
-
-/**
- * Graphics ODF elements that do not have &lt;draw:frame&gt; as parent should implement this interface.
- */
-public interface DrawingObjectElement extends DrawingObjectBaseElement {
-	/**
-	 * Return draw:caption-id attribute
-	 * 
-	 * @return String
-	 */		
-	public String getAttrDrawCaptionId();
-
-	/**
-	 * Return height of graphics
-	 * 
-	 * @return long
-	 */		
-	long getHeight();
-
-	/**
-	 * Return width of graphics
-	 * 
-	 * @return long
-	 */		
-	long getWidth();
-
-	/**
-	 * Return x position of graphics
-	 * 
-	 * @return long
-	 */		
-	long getX();
-
-	/**
-	 * Return y position of graphics
-	 * 
-	 * @return long
-	 */		
-	long getY();
-
-	/**
-	 * Set height of graphics
-	 * 
-	 * @param height
-	 *            height of graphics
-	 */		
-	void setHeight(long height);
-
-	/**
-	 * Set width of graphics
-	 * 
-	 * @param width
-	 *            width of graphics
-	 */		
-	void setWidth(long width);
-
-	/**
-	 * Set x position of graphics
-	 * 
-	 * @param x
-	 *            x position
-	 */		
-	void setX(long x);
-
-	/**
-	 * Set y position of graphics
-	 * 
-	 * @param y
-	 *            y position
-	 */		
-	void setY(long y);
-
-	/**
-	 * Return index of page which have this graphics
-	 * 
-	 * @return long
-	 */		
-	long getPageIndex();
-
-	/**
-	 * Return z-index of graphics
-	 * 
-	 * @return long
-	 */		
-	long getZIndex();
-
-	/**
-	 * Return text box element bounded by draw:caption-id attribute.
-	 * In ODF 1.0, this function always return null.
-	 * 
-	 * @return TextBoxElement
-	 */		
-	public TextBoxElement getBoundCaptionTextBoxElement();
-
-	/**
-	 * Return text box element bounded by draw:caption-id attribute
-	 * If ODF version is specified as 1.0, this function return null.
-	 * 
-	 * @param version
-	 *            version of ODF
-	 * @return TextBoxElement
-	 */		
-	public TextBoxElement getBoundCaptionTextBoxElement(double version);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/EmbedDrawingObjectElement.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/EmbedDrawingObjectElement.java
deleted file mode 100644
index b75cf05..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/EmbedDrawingObjectElement.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.base;
-
-import org.eclipse.actf.model.dom.odf.draw.FrameElement;
-import org.eclipse.actf.model.dom.odf.text.SequenceElement;
-
-/**
- * Graphics ODF elements that have &lt;draw:frame&gt; as parent should implement this interface.
- */
-public interface EmbedDrawingObjectElement extends DrawingObjectBaseElement {
-	/**
-	 * Return &lt;draw:framw&gt; element
-	 * 
-	 * @return FrameElement
-	 */	
-	public FrameElement getFrameElement();
-
-	/**
-	 * Return &lt;text:sequence&gt; element
-	 * 
-	 * @return SequenceElement
-	 */	
-	public SequenceElement getTextSequenceElement();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/ODFAttr.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/ODFAttr.java
deleted file mode 100644
index 117af8a..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/ODFAttr.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.base;
-
-import org.w3c.dom.Attr;
-
-/**
- * The extended interface of the {@link Attr}.
- */
-public interface ODFAttr extends ODFNode, Attr {
-}
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/ODFCharacterData.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/ODFCharacterData.java
deleted file mode 100644
index 9ae8015..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/ODFCharacterData.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.base;
-
-import org.w3c.dom.CharacterData;
-
-/**
- * The extended interface of the {@link CharacterData}.
- */
-public interface ODFCharacterData extends ODFNode, CharacterData {
-}
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/ODFComment.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/ODFComment.java
deleted file mode 100644
index 99d4139..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/ODFComment.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.base;
-
-import org.w3c.dom.Comment;
-
-/**
- * The extended interface of the {@link Comment}.
- */
-public interface ODFComment extends ODFCharacterData, Comment {
-}
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/ODFDocument.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/ODFDocument.java
deleted file mode 100644
index 2cad441..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/ODFDocument.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.base;
-
-import org.w3c.dom.Document;
-
-/**
- * The extended interface of the {@link Document}.
- */
-public interface ODFDocument extends Document {
-	/**
-	 * Return URL of ODF document
-	 * 
-	 * @return String
-	 */	
-	public String getURL();
-
-	/**
-	 * Set URL of ODF document
-	 * 
-	 * @param sUrl
-	 *            URL of ODF document
-	 */	
-	public void setURL(String sUrl);
-
-	/**
-	 * Set ODF version
-	 * 
-	 * @param version
-	 *            ODF version
-	 */	
-	public void setODFVersion(double version);
-
-	/**
-	 * Return ODF version
-	 * 
-	 * @return double
-	 */	
-	public double getODFVersion();
-
-	/**
-	 * Associate styles.xml document to this class
-	 * 
-	 * @param styleDoc
-	 *            ODF document created by styles.xml
-	 */	
-	public void setStyleDocument(ODFDocument styleDoc);
-
-	/**
-	 * Return ODF document created by styles.xml
-	 * 
-	 * @return ODFDocument
-	 */	
-	public ODFDocument getStyleDocument();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/ODFElement.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/ODFElement.java
deleted file mode 100644
index c53fa09..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/ODFElement.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.base;
-
-import org.w3c.dom.Element;
-
-/**
- * The extended interface of the {@link Element}.
- */
-public interface ODFElement extends Element {
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/ODFNamedNodeMap.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/ODFNamedNodeMap.java
deleted file mode 100644
index 8997aea..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/ODFNamedNodeMap.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.base;
-
-import org.w3c.dom.NamedNodeMap;
-
-/**
- * The extended interface of the {@link NamedNodeMap}.
- */
-public interface ODFNamedNodeMap extends NamedNodeMap {
-}
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/ODFNode.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/ODFNode.java
deleted file mode 100644
index 3b47b1b..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/ODFNode.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.base;
-
-import org.w3c.dom.Node;
-
-/**
- * The extended interface of the {@link Node}.
- */
-public interface ODFNode extends Node {
-}
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/ODFNodeList.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/ODFNodeList.java
deleted file mode 100644
index 4c5748e..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/ODFNodeList.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.base;
-
-import org.w3c.dom.NodeList;
-
-/**
- * The extended interface of the {@link NodeList}.
- */
-public interface ODFNodeList extends NodeList {
-}
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/ODFProcessingInstruction.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/ODFProcessingInstruction.java
deleted file mode 100644
index ffec997..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/ODFProcessingInstruction.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.base;
-
-import org.w3c.dom.ProcessingInstruction;
-
-/**
- * The extended interface of the {@link ProcessingInstruction}.
- */
-public interface ODFProcessingInstruction extends ODFNode,
-		ProcessingInstruction {
-}
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/ODFText.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/ODFText.java
deleted file mode 100644
index 5b092d5..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/ODFText.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.base;
-
-import org.w3c.dom.Text;
-
-/**
- * The extended interface of the {@link Text}.
- */
-public interface ODFText extends ODFCharacterData, Text {
-}
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/impl/AbstractODFNodeFactory.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/impl/AbstractODFNodeFactory.java
deleted file mode 100644
index 8093956..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/impl/AbstractODFNodeFactory.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.base.impl;
-
-import java.lang.reflect.Constructor;
-
-import org.eclipse.actf.model.dom.odf.base.ODFDocument;
-import org.eclipse.actf.model.dom.odf.base.ODFElement;
-import org.w3c.dom.Element;
-
-
-public abstract class AbstractODFNodeFactory {
-
-	@SuppressWarnings({ "unchecked", "cast" })
-	protected static Constructor<? extends ODFElement> findElementConstractor(Class<? extends ODFElement> cs) {
-		Constructor<? extends ODFElement>[] constructors = (Constructor<? extends ODFElement>[]) cs.getDeclaredConstructors();
-		for (int i = 0; i < constructors.length; i++) {
-			Class<?>[] parms = constructors[i].getParameterTypes();
-			if (parms.length == 2 && parms[0].equals(ODFDocument.class)
-					&& parms[1].equals(Element.class)) {
-				return constructors[i];
-			}
-		}
-		return null;
-	}
-
-	public static Element createElement(ODFDocument odfDoc, String tagName,
-			Element element) {
-		return null;
-	}
-}
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/impl/DrawingObjectBaseElementImpl.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/impl/DrawingObjectBaseElementImpl.java
deleted file mode 100644
index f814aa7..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/impl/DrawingObjectBaseElementImpl.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.base.impl;
-
-import org.eclipse.actf.model.dom.odf.ODFException;
-import org.eclipse.actf.model.dom.odf.base.DrawingObjectBaseElement;
-import org.eclipse.actf.model.dom.odf.base.ODFDocument;
-import org.eclipse.actf.model.dom.odf.base.ODFElement;
-import org.w3c.dom.Element;
-
-
-@SuppressWarnings("nls")
-public abstract class DrawingObjectBaseElementImpl extends ODFElementImpl
-		implements DrawingObjectBaseElement {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -4526393398550531657L;
-
-	protected DrawingObjectBaseElementImpl(ODFDocument odfDoc, Element element) {
-		super(odfDoc, element);
-	}
-
-	public ODFElement getShortDescElement() {
-		ODFDocument doc = (ODFDocument) this.getOwnerDocument();
-		return getShortDescElement(doc.getODFVersion());
-	}
-
-	public ODFElement getShortDescElement(double version) {
-		if (version == 1.0) {
-			return this.getSVGDescElement();
-		} else if (version > 1.0) {
-			return this.getSVGTitleElement();
-		} else {
-			new ODFException("invalid office version").printStackTrace();
-		}
-		return null;
-	}
-
-	public ODFElement getLongDescElement() {
-		ODFDocument doc = (ODFDocument) this.getOwnerDocument();
-		return getLongDescElement(doc.getODFVersion());
-	}
-
-	public ODFElement getLongDescElement(double version) {
-		if (version == 1.0) {
-			new ODFException("long desc is not available for ODF 1.0")
-					.printStackTrace();
-		} else if (version > 1.0) {
-			return this.getSVGDescElement();
-		} else {
-			new ODFException("invalid office version").printStackTrace();
-		}
-		return null;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/impl/DrawingObjectElementImpl.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/impl/DrawingObjectElementImpl.java
deleted file mode 100644
index 7e42c83..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/impl/DrawingObjectElementImpl.java
+++ /dev/null
@@ -1,253 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.base.impl;
-
-import org.eclipse.actf.model.dom.odf.ODFException;
-import org.eclipse.actf.model.dom.odf.ODFConstants.ContentType;
-import org.eclipse.actf.model.dom.odf.base.DrawingObjectElement;
-import org.eclipse.actf.model.dom.odf.base.ODFDocument;
-import org.eclipse.actf.model.dom.odf.base.ODFElement;
-import org.eclipse.actf.model.dom.odf.draw.DrawConstants;
-import org.eclipse.actf.model.dom.odf.draw.GElement;
-import org.eclipse.actf.model.dom.odf.draw.PageElement;
-import org.eclipse.actf.model.dom.odf.draw.TextBoxElement;
-import org.eclipse.actf.model.dom.odf.office.BodyElement;
-import org.eclipse.actf.model.dom.odf.office.DocumentContentElement;
-import org.eclipse.actf.model.dom.odf.office.SpreadSheetElement;
-import org.eclipse.actf.model.dom.odf.svg.DescElement;
-import org.eclipse.actf.model.dom.odf.svg.SVGConstants;
-import org.eclipse.actf.model.dom.odf.svg.TitleElement;
-import org.eclipse.actf.model.dom.odf.table.TableElement;
-import org.eclipse.actf.model.dom.odf.text.TextConstants;
-import org.eclipse.actf.util.xpath.XPathService;
-import org.eclipse.actf.util.xpath.XPathServiceFactory;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-@SuppressWarnings("nls")
-public abstract class DrawingObjectElementImpl extends
-		DrawingObjectBaseElementImpl implements DrawingObjectElement {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -934587640960571482L;
-	
-	private static final XPathService xpathService = XPathServiceFactory
-			.newService();
-	private static final Object EXP1 = xpathService
-			.compile("./*[(namespace-uri()='" + SVGConstants.SVG_NAMESPACE_URI
-					+ "' and local-name()='" + SVGConstants.ELEMENT_TITLE
-					+ "')]");
-
-	private static final Object EXP2 = xpathService
-			.compile("./*[(namespace-uri()='" + SVGConstants.SVG_NAMESPACE_URI
-					+ "' and local-name()='" + SVGConstants.ELEMENT_DESC
-					+ "')]");
-
-	protected DrawingObjectElementImpl(ODFDocument odfDoc, Element element) {
-		super(odfDoc, element);
-	}
-
-	public String getAttrDrawCaptionId() {
-		if (hasAttributeNS(DrawConstants.DRAW_NAMESPACE_URI,
-				DrawConstants.ATTR_CAPTION_ID))
-			return getAttributeNS(DrawConstants.DRAW_NAMESPACE_URI,
-					DrawConstants.ATTR_CAPTION_ID);
-		return null;
-	}
-
-	public long getHeight() {
-		// TODO Auto-generated method stub
-		return -1;
-	}
-
-	public long getWidth() {
-		// TODO Auto-generated method stub
-		return -1;
-	}
-
-	public long getX() {
-		// TODO Auto-generated method stub
-		return -1;
-	}
-
-	public long getY() {
-		// TODO Auto-generated method stub
-		return -1;
-	}
-
-	public void setHeight(long height) {
-		// TODO Auto-generated method stub
-
-	}
-
-	public void setWidth(long width) {
-		// TODO Auto-generated method stub
-
-	}
-
-	public void setX(long x) {
-		// TODO Auto-generated method stub
-
-	}
-
-	public void setY(long y) {
-		// TODO Auto-generated method stub
-
-	}
-
-	public long getPageIndex() {
-		// if presentation doc
-		PageElement page = null;
-		Node parent = getParentNode();
-		while (null != parent) {
-			if (parent instanceof PageElement) {
-				page = (PageElement) parent;
-				break;
-			}
-			if (parent instanceof BodyElement)
-				break;
-			parent = parent.getParentNode();
-		}
-		if (null != page)
-			return page.getPageIndex();
-
-		// if spreadsheet doc
-		TableElement sheet = null;
-		parent = getParentNode();
-		while (null != parent) {
-			if (parent instanceof TableElement) {
-				Node gparent = parent.getParentNode();
-				if (gparent instanceof SpreadSheetElement) {
-					sheet = (TableElement) parent;
-					break;
-				}
-			}
-			if (parent instanceof BodyElement)
-				break;
-			parent = parent.getParentNode();
-		}
-		if (null != sheet) {
-			int sheetIndex = 0;
-
-			Node preSib = sheet.getPreviousSibling();
-			while (preSib != null) {
-				if (preSib instanceof TableElement)
-					sheetIndex++;
-				preSib = preSib.getPreviousSibling();
-			}
-
-			return sheetIndex;
-		}
-
-		return -1;
-	}
-
-	public long getZIndex() {
-		// OpenOffice.org save draw:z-index attribute for all graphic object in
-		// ODT and ODS
-		if (hasAttributeNS(DrawConstants.DRAW_NAMESPACE_URI,
-				DrawConstants.ATTR_Z_INDEX)) {
-			try {
-				return new Integer(getAttributeNS(
-						DrawConstants.DRAW_NAMESPACE_URI,
-						DrawConstants.ATTR_Z_INDEX)).intValue();
-			} catch (NumberFormatException e) {
-			}
-		}
-
-		// OpenOffice.org don't save draw:z-index attribute for all graphic
-		// object in ODP
-		DocumentContentElement content = (DocumentContentElement) odfDoc
-				.getDocumentElement();
-		ContentType type = content.getBodyElement().getContent()
-				.getContentType();
-		if ((type == ContentType.PRESENTATION) || (type == ContentType.DRAW)) {
-			Node parent = getParentNode();
-			if (parent instanceof PageElement) {
-				int zIndex = 0;
-				Node preNode = this.getPreviousSibling();
-				while (preNode != null) {
-					if (preNode instanceof DrawingObjectElement) {
-						zIndex++;
-					} else if (preNode instanceof Element) {
-						NodeList nl = ((Element) preNode)
-								.getElementsByTagNameNS(
-										DrawConstants.DRAW_NAMESPACE_URI,
-										DrawConstants.ELEMENT_CONTROL);
-						if ((null != nl) && (nl.getLength() > 0))
-							zIndex += nl.getLength();
-					}
-					preNode = preNode.getPreviousSibling();
-				}
-				return zIndex;
-			} else if (parent instanceof GElement) {
-				return ((GElement) parent).getZIndex();
-			}
-		}
-		return -1;
-	}
-
-	public TextBoxElement getBoundCaptionTextBoxElement() {
-		ODFDocument odfDoc = (ODFDocument) getOwnerDocument();
-		return getBoundCaptionTextBoxElement(odfDoc.getODFVersion());
-	}
-
-	public TextBoxElement getBoundCaptionTextBoxElement(double version) {
-		if (version == 1.0)
-			return null;
-
-		String captionId = getAttrDrawCaptionId();
-		if (captionId == null)
-			return null;
-
-		ODFDocument odfDoc = (ODFDocument) getOwnerDocument();
-		ODFElementImpl root = (ODFElementImpl) odfDoc.getDocumentElement();
-		ODFElement elem = root.findElementByAttrValue(
-				DrawConstants.DRAW_NAMESPACE_URI,
-				DrawConstants.ELEMENT_TEXT_BOX,
-				TextConstants.TEXT_NAMESPACE_URI, TextConstants.ATTR_ID,
-				captionId);
-		if ((elem != null) && (elem instanceof TextBoxElement)) {
-			return (TextBoxElement) elem;
-		}
-		new ODFException(
-				"'draw:caption-id' does not point to text:box element.")
-				.printStackTrace();
-		return null;
-	}
-
-	public TitleElement getSVGTitleElement() {
-		NodeList nl = xpathService.evalForNodeList(EXP1, this);
-		if ((nl != null) && (nl.getLength() == 1))
-			return (TitleElement) nl.item(0);
-		if ((nl != null) && (nl.getLength() > 1)) {
-			new ODFException(
-					"drawing object has more than one svg:title elements.")
-					.printStackTrace();
-		}
-		return null;
-	}
-
-	public DescElement getSVGDescElement() {
-		NodeList nl = xpathService.evalForNodeList(EXP2, this);
-		if ((nl != null) && (nl.getLength() == 1))
-			return (DescElement) nl.item(0);
-		if ((nl != null) && (nl.getLength() > 1)) {
-			new ODFException(
-					"drawing object has more than one svg:desc elements.")
-					.printStackTrace();
-		}
-		return null;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/impl/EmbedDrawingObjectElementImpl.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/impl/EmbedDrawingObjectElementImpl.java
deleted file mode 100644
index 62303ae..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/impl/EmbedDrawingObjectElementImpl.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.base.impl;
-
-import org.eclipse.actf.model.dom.odf.ODFException;
-import org.eclipse.actf.model.dom.odf.base.EmbedDrawingObjectElement;
-import org.eclipse.actf.model.dom.odf.base.ODFDocument;
-import org.eclipse.actf.model.dom.odf.base.ODFElement;
-import org.eclipse.actf.model.dom.odf.draw.FrameElement;
-import org.eclipse.actf.model.dom.odf.svg.DescElement;
-import org.eclipse.actf.model.dom.odf.svg.TitleElement;
-import org.eclipse.actf.model.dom.odf.text.SequenceElement;
-import org.eclipse.actf.model.dom.odf.text.TextConstants;
-import org.eclipse.actf.util.xpath.XPathService;
-import org.eclipse.actf.util.xpath.XPathServiceFactory;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-@SuppressWarnings("nls")
-public abstract class EmbedDrawingObjectElementImpl extends
-		DrawingObjectBaseElementImpl implements EmbedDrawingObjectElement {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1100047270119869010L;
-
-	private static final XPathService xpathService = XPathServiceFactory
-			.newService();
-	private static final Object exp1 = xpathService
-			.compile("../*[namespace-uri()='"
-					+ TextConstants.TEXT_NAMESPACE_URI + "' and local-name()='"
-					+ TextConstants.ELEMENT_SEQUENCE + "']");
-
-	protected EmbedDrawingObjectElementImpl(ODFDocument odfDoc, Element element) {
-		super(odfDoc, element);
-	}
-
-	public FrameElement getFrameElement() {
-		ODFElement parent = (ODFElement) this.getParentNode();
-		if (parent instanceof FrameElement) {
-			return (FrameElement) parent;
-		} else {
-			new ODFException(
-					"parent of embed object element should be draw:frame element.")
-					.printStackTrace();
-		}
-		return null;
-	}
-
-	public TitleElement getSVGTitleElement() {
-		FrameElement frame = getFrameElement();
-		if (frame == null)
-			return null;
-		return frame.getSVGTitleElement();
-	}
-
-	public DescElement getSVGDescElement() {
-		FrameElement frame = getFrameElement();
-		if (frame == null)
-			return null;
-		return frame.getSVGDescElement();
-	}
-
-	public SequenceElement getTextSequenceElement() {
-		FrameElement frame = getFrameElement();
-		if (frame == null)
-			return null;
-
-		NodeList nl = xpathService.evalForNodeList(exp1, frame);
-		if ((nl != null) && (nl.getLength() == 1))
-			return (SequenceElement) nl.item(0);
-		if ((nl != null) && (nl.getLength() > 1)) {
-			new ODFException(
-					"draw:image has more than one text:sequence elements.")
-					.printStackTrace();
-		}
-		return null;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/impl/ODFAttrImpl.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/impl/ODFAttrImpl.java
deleted file mode 100644
index fa9aed8..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/impl/ODFAttrImpl.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.base.impl;
-
-import org.eclipse.actf.model.dom.odf.base.ODFAttr;
-import org.eclipse.actf.model.dom.odf.base.ODFDocument;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Element;
-import org.w3c.dom.TypeInfo;
-
-
-class ODFAttrImpl extends ODFNodeImpl implements ODFAttr {
-
-	public ODFAttrImpl(ODFDocument odfDoc, Attr iAttr) {
-		super(odfDoc, iAttr);
-	}
-
-	public String getName() {
-		return ((Attr) iNode).getName();
-	}
-
-	public Element getOwnerElement() {
-		if (iNode instanceof Attr) {
-			Element iOwner = ((Attr) iNode).getOwnerElement();
-			if (iOwner == null)
-				return null;
-
-			return (Element) odfDoc.getODFNode(iOwner);
-		}
-		return null;
-	}
-
-	public TypeInfo getSchemaTypeInfo() {
-		return ((Attr) iNode).getSchemaTypeInfo();
-	}
-
-	public boolean getSpecified() {
-		return ((Attr) iNode).getSpecified();
-	}
-
-	public String getValue() {
-		return ((Attr) iNode).getValue();
-	}
-
-	public boolean isId() {
-		return ((Attr) iNode).isId();
-	}
-
-	public void setValue(String value) throws DOMException {
-		((Attr) iNode).setValue(value);
-	}
-}
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/impl/ODFCharacterDataImpl.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/impl/ODFCharacterDataImpl.java
deleted file mode 100644
index 1974ad6..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/impl/ODFCharacterDataImpl.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.base.impl;
-
-import org.eclipse.actf.model.dom.odf.base.ODFCharacterData;
-import org.eclipse.actf.model.dom.odf.base.ODFDocument;
-import org.w3c.dom.CharacterData;
-import org.w3c.dom.DOMException;
-
-
-public class ODFCharacterDataImpl extends ODFNodeImpl implements
-		ODFCharacterData {
-
-	public ODFCharacterDataImpl(ODFDocument odfDoc,
-			CharacterData innerCharacterData) {
-		super(odfDoc, innerCharacterData);
-	}
-
-	public void appendData(String arg) throws DOMException {
-		if (iNode instanceof CharacterData) {
-			((CharacterData) iNode).appendData(arg);
-		}
-	}
-
-	public void deleteData(int offset, int count) throws DOMException {
-		if (iNode instanceof CharacterData) {
-			((CharacterData) iNode).deleteData(offset, count);
-		}
-	}
-
-	public String getData() throws DOMException {
-		if (iNode instanceof CharacterData) {
-			return ((CharacterData) iNode).getData();
-		}
-		return null;
-	}
-
-	public int getLength() {
-		if (iNode instanceof CharacterData) {
-			return ((CharacterData) iNode).getLength();
-		}
-		return 0;
-	}
-
-	public void insertData(int offset, String arg) throws DOMException {
-		if (iNode instanceof CharacterData) {
-			((CharacterData) iNode).insertData(offset, arg);
-		}
-	}
-
-	public void replaceData(int offset, int count, String arg)
-			throws DOMException {
-		if (iNode instanceof CharacterData) {
-			((CharacterData) iNode).replaceData(offset, count, arg);
-		}
-	}
-
-	public void setData(String data) throws DOMException {
-		if (iNode instanceof CharacterData) {
-			((CharacterData) iNode).setData(data);
-		}
-	}
-
-	public String substringData(int offset, int count) throws DOMException {
-		if (iNode instanceof CharacterData) {
-			return ((CharacterData) iNode).substringData(offset, count);
-		}
-		return null;
-	}
-}
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/impl/ODFCommentImpl.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/impl/ODFCommentImpl.java
deleted file mode 100644
index f326775..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/impl/ODFCommentImpl.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.base.impl;
-
-import org.eclipse.actf.model.dom.odf.base.ODFComment;
-import org.eclipse.actf.model.dom.odf.base.ODFDocument;
-import org.w3c.dom.Comment;
-
-
-public class ODFCommentImpl extends ODFCharacterDataImpl implements ODFComment {
-	public ODFCommentImpl(ODFDocument odfDoc, Comment innerComment) {
-		super(odfDoc, innerComment);
-	}
-}
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/impl/ODFDocumentImpl.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/impl/ODFDocumentImpl.java
deleted file mode 100644
index 92ded87..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/impl/ODFDocumentImpl.java
+++ /dev/null
@@ -1,412 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.base.impl;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.actf.model.dom.odf.base.ODFDocument;
-import org.eclipse.actf.model.dom.odf.base.ODFNode;
-import org.eclipse.actf.model.dom.odf.chart.ChartConstants;
-import org.eclipse.actf.model.dom.odf.chart.impl.ChartNodeFactory;
-import org.eclipse.actf.model.dom.odf.dr3d.Dr3dConstants;
-import org.eclipse.actf.model.dom.odf.dr3d.impl.Dr3dNodeFactory;
-import org.eclipse.actf.model.dom.odf.draw.DrawConstants;
-import org.eclipse.actf.model.dom.odf.draw.impl.DrawNodeFactory;
-import org.eclipse.actf.model.dom.odf.form.FormConstants;
-import org.eclipse.actf.model.dom.odf.form.impl.FormNodeFactory;
-import org.eclipse.actf.model.dom.odf.number.NumberConstants;
-import org.eclipse.actf.model.dom.odf.number.impl.NumberNodeFactory;
-import org.eclipse.actf.model.dom.odf.office.DocumentContentElement;
-import org.eclipse.actf.model.dom.odf.office.DocumentStylesElement;
-import org.eclipse.actf.model.dom.odf.office.OfficeConstants;
-import org.eclipse.actf.model.dom.odf.office.impl.OfficeNodeFactory;
-import org.eclipse.actf.model.dom.odf.presentation.PresentationConstants;
-import org.eclipse.actf.model.dom.odf.presentation.impl.PresentationNodeFactory;
-import org.eclipse.actf.model.dom.odf.style.StyleConstants;
-import org.eclipse.actf.model.dom.odf.style.impl.StyleNodeFactory;
-import org.eclipse.actf.model.dom.odf.svg.SVGConstants;
-import org.eclipse.actf.model.dom.odf.svg.impl.SVGNodeFactory;
-import org.eclipse.actf.model.dom.odf.table.TableConstants;
-import org.eclipse.actf.model.dom.odf.table.impl.TableNodeFactory;
-import org.eclipse.actf.model.dom.odf.text.TextConstants;
-import org.eclipse.actf.model.dom.odf.text.impl.TextNodeFactory;
-import org.w3c.dom.Attr;
-import org.w3c.dom.CDATASection;
-import org.w3c.dom.CharacterData;
-import org.w3c.dom.Comment;
-import org.w3c.dom.DOMConfiguration;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.DOMImplementation;
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentFragment;
-import org.w3c.dom.DocumentType;
-import org.w3c.dom.Element;
-import org.w3c.dom.EntityReference;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.ProcessingInstruction;
-import org.w3c.dom.Text;
-
-public class ODFDocumentImpl extends ODFNodeImpl implements ODFDocument {
-	private static final long serialVersionUID = 1L;
-
-	private static final Map<String, Class<? extends AbstractODFNodeFactory>> factoryMap = new HashMap<String, Class<? extends AbstractODFNodeFactory>>();
-	static {
-		factoryMap.put(ChartConstants.CHART_NAMESPACE_URI,
-				ChartNodeFactory.class);
-		factoryMap.put(Dr3dConstants.DR3D_NAMESPACE_URI, Dr3dNodeFactory.class);
-		factoryMap.put(DrawConstants.DRAW_NAMESPACE_URI, DrawNodeFactory.class);
-		factoryMap.put(FormConstants.FORM_NAMESPACE_URI, FormNodeFactory.class);
-		factoryMap.put(NumberConstants.NUMBER_NAMESPACE_URI,
-				NumberNodeFactory.class);
-		factoryMap.put(OfficeConstants.OFFICE_NAMESPACE_URI,
-				OfficeNodeFactory.class);
-		factoryMap.put(PresentationConstants.PRESENTATION_NAMESPACE_URI,
-				PresentationNodeFactory.class);
-		factoryMap.put(StyleConstants.STYLE_NAMESPACE_URI,
-				StyleNodeFactory.class);
-		factoryMap.put(TableConstants.TABLE_NAMESPACE_URI,
-				TableNodeFactory.class);
-		factoryMap.put(TextConstants.TEXT_NAMESPACE_URI, TextNodeFactory.class);
-		factoryMap.put(SVGConstants.SVG_NAMESPACE_URI, SVGNodeFactory.class);
-	}
-
-	private Map<Node, ODFNode> internalNodeMap = new HashMap<Node, ODFNode>();
-
-	private String sUrl = null;
-
-	private ODFDocument styleDoc = null;
-
-	public ODFDocumentImpl(Document doc) {
-		super(doc);
-		internalNodeMap.put(doc, this);
-	}
-
-	public Node adoptNode(Node source) throws DOMException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public Attr createAttribute(String name) throws DOMException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public Attr createAttributeNS(String namespaceURI, String qualifiedName)
-			throws DOMException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public CDATASection createCDATASection(String data) throws DOMException {
-		if (iNode instanceof Document) {
-			return ((Document) iNode).createCDATASection(data);
-		}
-		return null;
-	}
-
-	public Comment createComment(String data) {
-		if (iNode instanceof Document) {
-			return ((Document) iNode).createComment(data);
-		}
-		return null;
-	}
-
-	public DocumentFragment createDocumentFragment() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public Element createElement(String tagName) throws DOMException {
-		if (iNode instanceof Document) {
-			return (Element) getODFNode(((Document) iNode)
-					.createElement(tagName));
-		}
-		return null;
-	}
-
-	public Element createElementNS(String namespaceURI, String qualifiedName)
-			throws DOMException {
-		if (iNode instanceof Document) {
-			return (Element) getODFNode(((Document) iNode).createElementNS(
-					namespaceURI, qualifiedName));
-		}
-		return null;
-	}
-
-	public EntityReference createEntityReference(String name)
-			throws DOMException {
-		if (iNode instanceof Document) {
-			return ((Document) iNode).createEntityReference(name);
-		}
-		return null;
-	}
-
-	public ProcessingInstruction createProcessingInstruction(String target,
-			String data) throws DOMException {
-		if (iNode instanceof Document) {
-			return ((Document) iNode).createProcessingInstruction(target, data);
-		}
-		return null;
-	}
-
-	public Text createTextNode(String data) {
-		if (iNode instanceof Document) {
-			Text iText = ((Document) iNode).createTextNode(data);
-			return (Text) getODFNode(iText);
-		}
-		return null;
-	}
-
-	public DocumentType getDoctype() {
-		if (iNode instanceof Document) {
-			return ((Document) iNode).getDoctype();
-		}
-		return null;
-	}
-
-	public Element getDocumentElement() {
-		if (iNode instanceof Document) {
-			Element iElem = ((Document) iNode).getDocumentElement();
-			if (iElem == null)
-				return iElem;
-			return (Element) getODFNode(iElem);
-		}
-		return null;
-	}
-
-	public String getDocumentURI() {
-		if (iNode instanceof Document) {
-			return ((Document) iNode).getDocumentURI();
-		}
-		return null;
-	}
-
-	public DOMConfiguration getDomConfig() {
-		if (iNode instanceof Document) {
-			return ((Document) iNode).getDomConfig();
-		}
-		return null;
-	}
-
-	public Element getElementById(String elementId) {
-		if (iNode instanceof Document) {
-			Element iElem = ((Document) iNode).getElementById(elementId);
-			if (iElem == null)
-				return null;
-			return (Element) getODFNode(iElem);
-		}
-		return null;
-	}
-
-	public NodeList getElementsByTagName(String tagname) {
-		if (iNode instanceof Document) {
-			NodeList iNodeList = ((Document) iNode)
-					.getElementsByTagName(tagname);
-			if (iNodeList == null)
-				return null;
-			return new ODFNodeListImpl(this, iNodeList);
-		}
-		return null;
-	}
-
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) {
-		if (iNode instanceof Document) {
-			NodeList iNodeList = ((Document) iNode).getElementsByTagNameNS(
-					namespaceURI, localName);
-			if (iNodeList == null)
-				return null;
-			return new ODFNodeListImpl(this, iNodeList);
-		}
-		return null;
-	}
-
-	public DOMImplementation getImplementation() {
-		if (iNode instanceof Document) {
-			return ((Document) iNode).getImplementation();
-		}
-		return null;
-	}
-
-	public String getInputEncoding() {
-		if (iNode instanceof Document) {
-			return ((Document) iNode).getInputEncoding();
-		}
-		return null;
-	}
-
-	public boolean getStrictErrorChecking() {
-		if (iNode instanceof Document) {
-			return ((Document) iNode).getStrictErrorChecking();
-		}
-		return false;
-	}
-
-	public String getXmlEncoding() {
-		if (iNode instanceof Document) {
-			return ((Document) iNode).getXmlEncoding();
-		}
-		return null;
-	}
-
-	public boolean getXmlStandalone() {
-		if (iNode instanceof Document) {
-			return ((Document) iNode).getXmlStandalone();
-		}
-		return false;
-	}
-
-	public String getXmlVersion() {
-		if (iNode instanceof Document) {
-			return ((Document) iNode).getXmlVersion();
-		}
-		return null;
-	}
-
-	public Node importNode(Node importedNode, boolean deep) throws DOMException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public void normalizeDocument() {
-		// TODO Auto-generated method stub
-
-	}
-
-	public Node renameNode(Node n, String namespaceURI, String qualifiedName)
-			throws DOMException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public void setDocumentURI(String documentURI) {
-		if (iNode instanceof Document) {
-			((Document) iNode).setDocumentURI(documentURI);
-		}
-	}
-
-	public void setStrictErrorChecking(boolean strictErrorChecking) {
-		if (iNode instanceof Document) {
-			((Document) iNode).setStrictErrorChecking(strictErrorChecking);
-		}
-	}
-
-	public void setXmlStandalone(boolean xmlStandalone) throws DOMException {
-		if (iNode instanceof Document) {
-			((Document) iNode).setXmlStandalone(xmlStandalone);
-		}
-	}
-
-	public void setXmlVersion(String xmlVersion) throws DOMException {
-		if (iNode instanceof Document) {
-			((Document) iNode).setXmlVersion(xmlVersion);
-		}
-	}
-
-	// /////////////////////////////////
-	// ODFDocument implementation
-	// /////////////////////////////////
-
-	private Method findCreateElementMethod(Class<? extends AbstractODFNodeFactory> cs) {
-		Method[] methods = cs.getDeclaredMethods();
-		for (int i = 0; i < methods.length; i++) {
-			if ("createElement".equals(methods[i].getName())) { //$NON-NLS-1$
-				Class<?>[] parms = methods[i].getParameterTypes();
-				if (parms.length == 3 && parms[0].equals(ODFDocument.class)
-						&& parms[1].equals(String.class)
-						&& parms[2].equals(Element.class)) {
-					return methods[i];
-				}
-			}
-		}
-		return null;
-	}
-
-	public ODFNode getODFNode(Node node) {
-		ODFNode result = internalNodeMap.get(node);
-		if (result != null)
-			return result;
-
-		Class<? extends AbstractODFNodeFactory> factory = factoryMap.get(node
-				.getNamespaceURI());
-		if (factory != null) {
-			if (node instanceof Element) {
-				Method createElemMethod = findCreateElementMethod(factory);
-				try {
-					result = (ODFNode) createElemMethod.invoke(factory,
-							new Object[] { this, node.getLocalName(),
-									(Element) node });
-				} catch (IllegalArgumentException e) {
-					e.printStackTrace();
-				} catch (IllegalAccessException e) {
-					e.printStackTrace();
-				} catch (InvocationTargetException e) {
-					e.printStackTrace();
-				}
-			}
-		}
-		if (result == null) {
-			if (node instanceof Element) {
-				result = new ODFElementImpl(this, (Element) node);
-			} else if (node instanceof Attr) {
-				result = new ODFAttrImpl(this, (Attr) node);
-			} else if (node instanceof Text) {
-				result = new ODFTextImpl(this, (Text) node);
-			} else if (node instanceof Comment) {
-				result = new ODFCommentImpl(this, (Comment) node);
-			} else if (node instanceof CharacterData) {
-				result = new ODFCharacterDataImpl(this, (CharacterData) node);
-			} else if (node instanceof ProcessingInstruction) {
-				result = new ODFProcessingInstructionImpl(this,
-						(ProcessingInstruction) node);
-			} else {
-				result = new ODFNodeImpl(this, node);
-			}
-		}
-		internalNodeMap.put(node, result);
-		return result;
-	}
-
-	public String getURL() {
-		return sUrl;
-	}
-
-	public void setURL(String sUrl) {
-		this.sUrl = sUrl;
-	}
-
-	public void setODFVersion(double version) {
-		Element root = this.getDocumentElement();
-		root.setAttributeNS(OfficeConstants.OFFICE_NAMESPACE_URI,
-				OfficeConstants.ATTR_VERSION, new Double(version).toString());
-	}
-
-	public double getODFVersion() {
-		Element root = this.getDocumentElement();
-		if (root instanceof DocumentContentElement) {
-			return ((DocumentContentElement) root).getAttrOfficeVersion();
-		} else if (root instanceof DocumentStylesElement) {
-			return ((DocumentStylesElement) root).getAttrOfficeVersion();
-		}
-		return -1.0;
-	}
-
-	public void setStyleDocument(ODFDocument styleDoc) {
-		this.styleDoc = styleDoc;
-	}
-
-	public ODFDocument getStyleDocument() {
-		return this.styleDoc;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/impl/ODFElementImpl.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/impl/ODFElementImpl.java
deleted file mode 100644
index 24b2c6c..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/impl/ODFElementImpl.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.base.impl;
-
-import java.io.Serializable;
-
-import org.eclipse.actf.model.dom.odf.base.ODFDocument;
-import org.eclipse.actf.model.dom.odf.base.ODFElement;
-import org.eclipse.actf.model.dom.odf.office.DocumentStylesElement;
-import org.eclipse.actf.util.xpath.XPathServiceFactory;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-
-public class ODFElementImpl extends ODFNodeImpl implements ODFElement,
-		Serializable {
-	private static final long serialVersionUID = -4579652376938577296L;
-
-	public ODFElementImpl(ODFDocument odfDoc, Element iElement) {
-		super(odfDoc, iElement);
-	}
-
-	@SuppressWarnings("nls")
-	public ODFElement findElementByAttrValue(String elemNamespaceURI,
-			String elemLocalName, String attrNamespaceURI,
-			String attrLocalName, String attrValue) {
-		Element root = getOwnerDocument().getDocumentElement();
-		NodeList nl = XPathServiceFactory.newService().evalPathForNodeList(
-				".//*[namespace-uri()='" + elemNamespaceURI
-						+ "' and local-name()='" + elemLocalName + "']"
-						+ "[attribute::*[namespace-uri()='" + attrNamespaceURI
-						+ "' and local-name()='" + attrLocalName + "']='"
-						+ attrValue + "']", root);
-		if ((nl != null) && (nl.getLength() != 0)) {
-			return (ODFElement) nl.item(0);
-		}
-		return null;
-	}
-
-	public ODFElement findElementByAttrValueFromStyleDoc(
-			String elemNamespaceURI, String elemLocalName,
-			String attrNamespaceURI, String attrLocalName, String attrValue) {
-		ODFDocument styleDoc = ((ODFDocument) getOwnerDocument())
-				.getStyleDocument();
-		if (styleDoc == null)
-			return null;
-		Element styleRoot = styleDoc.getDocumentElement();
-		if ((styleRoot != null) && (styleRoot instanceof DocumentStylesElement)) {
-			return ((ODFElementImpl) styleRoot).findElementByAttrValue(
-					elemNamespaceURI, elemLocalName, attrNamespaceURI,
-					attrLocalName, attrValue);
-		}
-		return null;
-	}
-
-	public String getAttribute(String name) {
-		if (iNode instanceof Element) {
-			return ((Element) iNode).getAttribute(name);
-		}
-		return null;
-	}
-
-	public String getAttributeNS(String namespaceURI, String localName)
-			throws DOMException {
-		if (iNode instanceof Element) {
-			return ((Element) iNode).getAttributeNS(namespaceURI, localName);
-		}
-		return null;
-	}
-
-	public Attr getAttributeNode(String name) {
-		if (iNode instanceof Element) {
-			Attr iAttr = ((Element) iNode).getAttributeNode(name);
-			if (iAttr == null)
-				return null;
-
-			return (Attr) odfDoc.getODFNode(iAttr);
-		}
-		return null;
-	}
-
-	public Attr getAttributeNodeNS(String namespaceURI, String localName)
-			throws DOMException {
-		if (iNode instanceof Element) {
-			Attr iAttr = ((Element) iNode).getAttributeNodeNS(namespaceURI,
-					localName);
-			if (iAttr == null)
-				return null;
-
-			return (Attr) odfDoc.getODFNode(iAttr);
-		}
-		return null;
-	}
-
-	public NodeList getElementsByTagName(String name) {
-		if (iNode instanceof Element) {
-			NodeList iNodeList = ((Element) iNode).getElementsByTagName(name);
-			return new ODFNodeListImpl(odfDoc, iNodeList);
-		}
-		return null;
-	}
-
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName)
-			throws DOMException {
-		if (iNode instanceof Element) {
-			NodeList iNodeList = ((Element) iNode).getElementsByTagNameNS(
-					namespaceURI, localName);
-			return new ODFNodeListImpl(odfDoc, iNodeList);
-		}
-		return null;
-	}
-
-	public TypeInfo getSchemaTypeInfo() {
-		if (iNode instanceof Element) {
-			return ((Element) iNode).getSchemaTypeInfo();
-		}
-		return null;
-	}
-
-	public String getTagName() {
-		if (iNode instanceof Element) {
-			return ((Element) iNode).getTagName();
-		}
-		return null;
-	}
-
-	public boolean hasAttribute(String name) {
-		if (iNode instanceof Element) {
-			return ((Element) iNode).hasAttribute(name);
-		}
-		return false;
-	}
-
-	public boolean hasAttributeNS(String namespaceURI, String localName)
-			throws DOMException {
-		if (iNode instanceof Element) {
-			return ((Element) iNode).hasAttributeNS(namespaceURI, localName);
-		}
-		return false;
-	}
-
-	public void removeAttribute(String name) throws DOMException {
-		if (iNode instanceof Element) {
-			((Element) iNode).removeAttribute(name);
-		}
-	}
-
-	public void removeAttributeNS(String namespaceURI, String localName)
-			throws DOMException {
-		if (iNode instanceof Element) {
-			((Element) iNode).removeAttributeNS(namespaceURI, localName);
-		}
-	}
-
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		if (iNode instanceof Element) {
-			Attr iRemovedAttr = ((Element) iNode).removeAttributeNode(oldAttr);
-			odfDoc.getODFNode(iRemovedAttr);
-		}
-		return null;
-	}
-
-	public void setAttribute(String name, String value) throws DOMException {
-		((Element) iNode).setAttribute(name, value);
-		Attr iNewAttr = ((Element) iNode).getAttributeNode(name);
-
-		if (iNewAttr == null)
-			return;
-		odfDoc.getODFNode(iNewAttr);
-		return;
-	}
-
-	public void setAttributeNS(String namespaceURI, String qualifiedName,
-			String value) throws DOMException {
-		((Element) iNode).setAttributeNS(namespaceURI, qualifiedName, value);
-		Attr iNewAttr = ((Element) iNode).getAttributeNodeNS(namespaceURI,
-				qualifiedName);
-
-		if (iNewAttr == null)
-			return;
-		odfDoc.getODFNode(iNewAttr);
-		return;
-	}
-
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		if ((iNode instanceof Element) && (newAttr instanceof ODFNodeImpl)) {
-			Node iNewAttr = ((ODFNodeImpl) newAttr).getInternalNode();
-			if (iNewAttr instanceof Attr) {
-				try {
-					((Element) iNode).setAttributeNode((Attr) iNewAttr);
-				} catch (Exception e) {
-					e.printStackTrace();
-				}
-
-				// if (iNewAttr == null)
-				// return null;
-				return (Attr) odfDoc.getODFNode(iNewAttr);
-			}
-		}
-		return null;
-	}
-
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return setAttributeNode(newAttr);
-	}
-
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		((Element) iNode).setIdAttribute(name, isId);
-	}
-
-	public void setIdAttributeNS(String namespaceURI, String localName,
-			boolean isId) throws DOMException {
-		((Element) iNode).setIdAttributeNS(namespaceURI, localName, isId);
-	}
-
-	public void setIdAttributeNode(Attr idAttr, boolean isId)
-			throws DOMException {
-		Node internalIdAttr = ((ODFNodeImpl) idAttr).getInternalNode();
-		if ((iNode instanceof Element) && (internalIdAttr instanceof Attr)) {
-			((Element) iNode).setIdAttributeNode((Attr) internalIdAttr, isId);
-		}
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/impl/ODFNamedNodeMapImpl.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/impl/ODFNamedNodeMapImpl.java
deleted file mode 100644
index c7ce9fe..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/impl/ODFNamedNodeMapImpl.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.base.impl;
-
-import org.eclipse.actf.model.dom.odf.base.ODFDocument;
-import org.eclipse.actf.model.dom.odf.base.ODFNamedNodeMap;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-
-class ODFNamedNodeMapImpl implements ODFNamedNodeMap {
-	protected ODFDocumentImpl odfDoc = null;
-
-	private NamedNodeMap iAttrs;
-
-	public ODFNamedNodeMapImpl(ODFDocument odfDoc, NamedNodeMap iAttrs) {
-		this.odfDoc = (ODFDocumentImpl) odfDoc;
-		this.iAttrs = iAttrs;
-	}
-
-	public Node item(int index) {
-		Node iNode = iAttrs.item(index);
-		if (iNode == null)
-			return null;
-		return odfDoc.getODFNode(iNode);
-	}
-
-	public int getLength() {
-		return iAttrs.getLength();
-	}
-
-	public Node getNamedItem(String name) {
-		Node iNode = iAttrs.getNamedItem(name);
-		if (iNode == null)
-			return null;
-		return odfDoc.getODFNode(iNode);
-	}
-
-	public Node setNamedItem(Node node) throws DOMException {
-		Node iNode = iAttrs.setNamedItem(node);
-		if (iNode == null)
-			return null;
-		return odfDoc.getODFNode(iNode);
-	}
-
-	public Node removeNamedItem(String name) throws DOMException {
-		Node iNode = iAttrs.removeNamedItem(name);
-		if (iNode == null)
-			return null;
-		return odfDoc.getODFNode(iNode);
-	}
-
-	public Node getNamedItemNS(String namespaceURI, String localName) {
-		Node iNode = iAttrs.getNamedItemNS(namespaceURI, localName);
-		if (iNode == null)
-			return null;
-		return odfDoc.getODFNode(iNode);
-	}
-
-	public Node setNamedItemNS(Node node) throws DOMException {
-		Node iNode = iAttrs.setNamedItemNS(node);
-		if (iNode == null)
-			return null;
-		return odfDoc.getODFNode(iNode);
-	}
-
-	public Node removeNamedItemNS(String namespaceURI, String localName)
-			throws DOMException {
-		Node iNode = iAttrs.removeNamedItemNS(namespaceURI, localName);
-		if (iNode == null)
-			return null;
-		return odfDoc.getODFNode(iNode);
-	}
-}
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/impl/ODFNodeImpl.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/impl/ODFNodeImpl.java
deleted file mode 100644
index 1a3190b..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/impl/ODFNodeImpl.java
+++ /dev/null
@@ -1,284 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.base.impl;
-
-import org.eclipse.actf.model.dom.odf.base.ODFDocument;
-import org.eclipse.actf.model.dom.odf.base.ODFNode;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.UserDataHandler;
-
-
-class ODFNodeImpl implements ODFNode {
-	protected ODFDocumentImpl odfDoc = null;
-
-	protected Node iNode = null;
-
-	// constructure for ODFDocumentImpl
-	protected ODFNodeImpl(Node iNode) {
-		this.odfDoc = (ODFDocumentImpl) this;
-		this.iNode = iNode;
-	}
-
-	protected ODFNodeImpl(ODFDocument odfDoc, Node iNode) {
-		this.odfDoc = (ODFDocumentImpl) odfDoc;
-		this.iNode = iNode;
-	}
-
-	protected Node getInternalNode() {
-		return iNode;
-	}
-
-	public Node appendChild(Node newChild) throws DOMException {
-		if (newChild instanceof ODFNodeImpl) {
-			Node iNewChild = ((ODFNodeImpl) newChild).getInternalNode();
-			Node iResultNode = iNode.appendChild(iNewChild);
-			return new ODFNodeImpl(odfDoc, iResultNode);
-		}
-		return null;
-	}
-
-	public Node cloneNode(boolean deep) {
-		if (odfDoc == null)
-			return null;
-
-		Node iCloneNode = iNode.cloneNode(deep);
-		if (iCloneNode == null)
-			return null;
-
-		return odfDoc.getODFNode(iCloneNode);
-	}
-
-	public short compareDocumentPosition(Node other) throws DOMException {
-		if (other instanceof ODFNodeImpl) {
-			Node iOther = ((ODFNodeImpl) other).getInternalNode();
-			return iNode.compareDocumentPosition(iOther);
-		}
-		return 0;
-	}
-
-	public NamedNodeMap getAttributes() {
-		if (odfDoc == null)
-			return null;
-
-		NamedNodeMap iAttrs = iNode.getAttributes();
-		if (iAttrs == null)
-			return null;
-		return new ODFNamedNodeMapImpl(odfDoc, iAttrs);
-	}
-
-	public String getBaseURI() {
-		return iNode.getBaseURI();
-	}
-
-	public NodeList getChildNodes() {
-		return new ODFNodeListImpl(odfDoc, iNode.getChildNodes());
-	}
-
-	public Object getFeature(String feature, String version) {
-		throw new UnsupportedOperationException();
-	}
-
-	public Node getFirstChild() {
-		if (odfDoc == null)
-			return null;
-
-		Node iFirstChild = iNode.getFirstChild();
-		if (iFirstChild == null)
-			return null;
-
-		return odfDoc.getODFNode(iFirstChild);
-	}
-
-	public Node getLastChild() {
-		if (odfDoc == null)
-			return null;
-
-		Node iLastChild = iNode.getLastChild();
-		if (iLastChild == null)
-			return null;
-
-		return odfDoc.getODFNode(iLastChild);
-	}
-
-	public String getLocalName() {
-		return iNode.getLocalName();
-	}
-
-	public String getNamespaceURI() {
-		return iNode.getNamespaceURI();
-	}
-
-	public Node getNextSibling() {
-		if (odfDoc == null)
-			return null;
-
-		Node iNextSibling = iNode.getNextSibling();
-		if (iNextSibling == null)
-			return null;
-
-		return odfDoc.getODFNode(iNextSibling);
-	}
-
-	public String getNodeName() {
-		return iNode.getNodeName();
-	}
-
-	public short getNodeType() {
-		return iNode.getNodeType();
-	}
-
-	public String getNodeValue() throws DOMException {
-		return iNode.getNodeValue();
-	}
-
-	public Document getOwnerDocument() {
-		return odfDoc;
-	}
-
-	public Node getParentNode() {
-		Node iParent = iNode.getParentNode();
-		if (iParent == null)
-			return null;
-		return odfDoc.getODFNode(iParent);
-	}
-
-	public String getPrefix() {
-		return iNode.getPrefix();
-	}
-
-	public Node getPreviousSibling() {
-		if (odfDoc == null)
-			return null;
-
-		Node iPreviousSibling = iNode.getPreviousSibling();
-		if (iPreviousSibling == null)
-			return null;
-
-		return odfDoc.getODFNode(iPreviousSibling);
-	}
-
-	public String getTextContent() throws DOMException {
-		return iNode.getTextContent();
-	}
-
-	public Object getUserData(String key) {
-		return iNode.getUserData(key);
-	}
-
-	public boolean hasAttributes() {
-		return iNode.hasAttributes();
-	}
-
-	public boolean hasChildNodes() {
-		return iNode.hasChildNodes();
-	}
-
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		if (odfDoc == null)
-			return null;
-
-		if ((newChild instanceof ODFNodeImpl)
-				&& (refChild instanceof ODFNodeImpl)) {
-			Node iNewChild = ((ODFNodeImpl) newChild).getInternalNode();
-			Node iRefChild = ((ODFNodeImpl) refChild).getInternalNode();
-			Node iInsertedChild = iNode.insertBefore(iNewChild, iRefChild);
-			if (iInsertedChild == null)
-				return null;
-			return odfDoc.getODFNode(iInsertedChild);
-		}
-		return null;
-	}
-
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return iNode.isDefaultNamespace(namespaceURI);
-	}
-
-	public boolean isEqualNode(Node arg) {
-		if (arg instanceof ODFNodeImpl) {
-			Node iarg = ((ODFNodeImpl) arg).getInternalNode();
-			return iNode.isEqualNode(iarg);
-		}
-		return false;
-	}
-
-	public boolean isSameNode(Node other) {
-		if (other instanceof ODFNodeImpl) {
-			Node iother = ((ODFNodeImpl) other).getInternalNode();
-			return iNode.isSameNode(iother);
-		}
-		return false;
-	}
-
-	public boolean isSupported(String feature, String version) {
-		return iNode.isSupported(feature, version);
-	}
-
-	public String lookupNamespaceURI(String prefix) {
-		return iNode.lookupNamespaceURI(prefix);
-	}
-
-	public String lookupPrefix(String namespaceURI) {
-		return iNode.lookupPrefix(namespaceURI);
-	}
-
-	public void normalize() {
-		// TODO Auto-generated method stub
-
-	}
-
-	public Node removeChild(Node oldChild) throws DOMException {
-		if (odfDoc == null)
-			return null;
-
-		if (oldChild instanceof ODFNodeImpl) {
-			Node iOldChild = ((ODFNodeImpl) oldChild).getInternalNode();
-			Node iRemovedChild = iNode.removeChild(iOldChild);
-			return odfDoc.getODFNode(iRemovedChild);
-		}
-		return null;
-	}
-
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		if (odfDoc == null)
-			return null;
-
-		if ((newChild instanceof ODFNodeImpl)
-				&& (oldChild instanceof ODFNodeImpl)) {
-			Node iNewChild = ((ODFNodeImpl) newChild).getInternalNode();
-			Node iOldChild = ((ODFNodeImpl) oldChild).getInternalNode();
-			Node iReplacedChild = iNode.replaceChild(iNewChild, iOldChild);
-			return odfDoc.getODFNode(iReplacedChild);
-		}
-		return null;
-	}
-
-	public void setNodeValue(String nodeValue) throws DOMException {
-		iNode.setNodeValue(nodeValue);
-	}
-
-	public void setPrefix(String prefix) throws DOMException {
-		iNode.setPrefix(prefix);
-	}
-
-	public void setTextContent(String textContent) throws DOMException {
-		iNode.setTextContent(textContent);
-	}
-
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-}
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/impl/ODFNodeListImpl.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/impl/ODFNodeListImpl.java
deleted file mode 100644
index 8f88358..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/impl/ODFNodeListImpl.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.base.impl;
-
-import org.eclipse.actf.model.dom.odf.base.ODFNodeList;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-
-class ODFNodeListImpl implements ODFNodeList {
-	private ODFDocumentImpl owner;
-
-	private NodeList iNodeList;
-
-	public ODFNodeListImpl(ODFDocumentImpl owner, NodeList iNodeList) {
-		this.owner = owner;
-		this.iNodeList = iNodeList;
-	}
-
-	public Node item(int index) {
-		Node iNode = iNodeList.item(index);
-		if (iNode == null)
-			return null;
-		return owner.getODFNode(iNode);
-	}
-
-	public int getLength() {
-		return iNodeList.getLength();
-	}
-}
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/impl/ODFProcessingInstructionImpl.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/impl/ODFProcessingInstructionImpl.java
deleted file mode 100644
index 11615c5..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/impl/ODFProcessingInstructionImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.base.impl;
-
-import org.eclipse.actf.model.dom.odf.base.ODFDocument;
-import org.eclipse.actf.model.dom.odf.base.ODFProcessingInstruction;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.ProcessingInstruction;
-
-
-public class ODFProcessingInstructionImpl extends ODFNodeImpl implements
-		ODFProcessingInstruction {
-
-	public ODFProcessingInstructionImpl(ODFDocument odfDoc,
-			ProcessingInstruction innerProcessingInstruction) {
-		super(odfDoc, innerProcessingInstruction);
-	}
-
-	public String getData() {
-		if (iNode instanceof ProcessingInstruction) {
-			return ((ProcessingInstruction) iNode).getData();
-		}
-		return null;
-	}
-
-	public String getTarget() {
-		if (iNode instanceof ProcessingInstruction) {
-			return ((ProcessingInstruction) iNode).getTarget();
-		}
-		return null;
-	}
-
-	public void setData(String s) throws DOMException {
-		if (iNode instanceof ProcessingInstruction) {
-			((ProcessingInstruction) iNode).setData(s);
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/impl/ODFStylableElementImpl.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/impl/ODFStylableElementImpl.java
deleted file mode 100644
index 3bb64cc..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/impl/ODFStylableElementImpl.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.base.impl;
-
-import org.eclipse.actf.model.dom.odf.base.ODFDocument;
-import org.eclipse.actf.model.dom.odf.base.ODFElement;
-import org.eclipse.actf.model.dom.odf.content.IStylable;
-import org.eclipse.actf.model.dom.odf.content.IStyleListener;
-import org.eclipse.actf.model.dom.odf.style.StyleElement;
-import org.w3c.dom.Element;
-
-
-public abstract class ODFStylableElementImpl extends ODFElementImpl implements
-		ODFElement, IStylable {
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -1550683236941591367L;
-
-	protected ODFStylableElementImpl(ODFDocument odfDoc, Element element) {
-		super(odfDoc, element);
-	}
-
-	public void setStyle(StyleElement style) {
-		// TODO Auto-generated method stub
-	}
-
-	public StyleElement getStyle() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public void addStyleListener(IStyleListener listener, String topic) {
-		// TODO Auto-generated method stub
-	}
-
-	public void removeStyleListener(IStyleListener listener, String topic) {
-		// TODO Auto-generated method stub
-	}
-}
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/impl/ODFTextImpl.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/impl/ODFTextImpl.java
deleted file mode 100644
index ab54dd0..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/impl/ODFTextImpl.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.base.impl;
-
-import org.eclipse.actf.model.dom.odf.base.ODFDocument;
-import org.eclipse.actf.model.dom.odf.base.ODFText;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Text;
-
-
-class ODFTextImpl extends ODFCharacterDataImpl implements ODFText {
-
-	public ODFTextImpl(ODFDocument odfDoc, Text innerText) {
-		super(odfDoc, innerText);
-	}
-
-	public String getWholeText() {
-		if (iNode instanceof Text) {
-			return ((Text) iNode).getWholeText();
-		}
-		return null;
-	}
-
-	public boolean isElementContentWhitespace() {
-		if (iNode instanceof Text) {
-			return ((Text) iNode).isElementContentWhitespace();
-		}
-		return false;
-	}
-
-	public Text replaceWholeText(String content) throws DOMException {
-		if (iNode instanceof Text) {
-			return ((Text) iNode).replaceWholeText(content);
-		}
-		return null;
-	}
-
-	public Text splitText(int offset) throws DOMException {
-		if (iNode instanceof Text) {
-			return ((Text) iNode).splitText(offset);
-		}
-		return null;
-	}
-}
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/package-info.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/package-info.java
deleted file mode 100644
index b939d99..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/base/package-info.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Kentarou FUKUDA - initial API and implementation
- *******************************************************************************/
-
-/**
- * This package contains interfaces of ODF DOM.
- */
-package org.eclipse.actf.model.dom.odf.base;
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/AxisElement.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/AxisElement.java
deleted file mode 100644
index d7264ac..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/AxisElement.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.chart;
-
-import org.eclipse.actf.model.dom.odf.base.ODFElement;
-import org.eclipse.actf.model.dom.odf.content.IStylable;
-
-/**
- * Interface for &lt;chart:axis&gt; element.
- */
-public interface AxisElement extends ODFElement, IStylable {
-	/**
-	 * Return chart:dimension attribute
-	 * 
-	 * @return String
-	 */	
-	public String getAttrChartDimension();
-
-	/**
-	 * Return chart:name attribute
-	 * 
-	 * @return String
-	 */	
-	public String getAttrChartName();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/CategoriesElement.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/CategoriesElement.java
deleted file mode 100644
index 2335d05..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/CategoriesElement.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.chart;
-
-import org.eclipse.actf.model.dom.odf.base.ODFElement;
-
-/**
- * Interface for &lt;chart:categories&gt; element.
- */
-public interface CategoriesElement extends ODFElement {
-	/**
-	 * Return table:cell-range-address attribute
-	 * 
-	 * @return String
-	 */		
-	public String getAttrTableCellRangeAddress();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/ChartConstants.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/ChartConstants.java
deleted file mode 100644
index 13c3f94..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/ChartConstants.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.chart;
-
-/**
- * ChartConstants defines the constant values used by chart namespace of ODF DOM API
- */
-@SuppressWarnings("nls")
-public final class ChartConstants {
-	static public final String CHART_NAMESPACE_URI = "urn:oasis:names:tc:opendocument:xmlns:chart:1.0";
-
-	static public final String ELEMENT_CHART = "chart";
-
-	static public final String ELEMENT_TITLE = "title";
-
-	static public final String ELEMENT_LEGEND = "legend";
-
-	static public final String ELEMENT_PLOT_AREA = "plot-area";
-
-	static public final String ELEMENT_AXIS = "axis";
-
-	static public final String ELEMENT_CATEGORIES = "categories";
-
-	static public final String ELEMENT_GRID = "grid";
-
-	static public final String ELEMENT_SERIES = "series";
-
-	static public final String ELEMENT_DATA_POINT = "data-point";
-
-	static public final String ELEMENT_STOCK_GAIN_MARKER = "stock-gain-marker";
-
-	static public final String ELEMENT_STOCK_LOSS_MARKER = "stock-loss-marker";
-
-	static public final String ELEMENT_STOCK_RANGE_LINE = "stock-range-line";
-
-	static public final String ELEMENT_WALL = "wall";
-
-	static public final String ELEMENT_FLOOR = "floor";
-
-	static public final String ATTR_DIMENSION = "dimension";
-
-	static public final String ATTR_NAME = "name";
-
-	static public final String ATTR_CLASS = "class";
-
-	static public final String ATTR_REPEATED = "repeated";
-
-	static public final String ATTR_LEGEND_POSITION = "legend-position";
-
-	static public final String ATTR_DATA_SOURCE_HAS_LABELS = "data-source-has-labels";
-
-	static public final String ATTR_TABLE_NUMBER_LIST = "table-number-list";
-
-	static public final String ATTR_STYLE_NAME = "style-name";
-
-	static public final String ATTR_JAPANESE_CANDLE_STICK = "japanese-candle-stick";
-
-	static public final String ATTR_STOCK_WITH_VOLUME = "stock-with-volume";
-
-	static public final String ATTR_THREE_DIMENSIONAL = "three-dimensional";
-
-	static public final String ATTR_DEEP = "deep";
-
-	static public final String ATTR_LINES = "lines";
-
-	static public final String ATTR_INTERPOLATION = "interpolation";
-
-	static public final String ATTR_SYMBOL_TYPE = "symbol-type";
-
-	static public final String ATTR_VERTICAL = "vertical";
-
-	static public final String ATTR_LINES_USED = "lines-used";
-
-	static public final String ATTR_CONNECT_BARS = "connect-bars";
-
-	static public final String ATTR_SERIES_SOURCE = "series-source";
-
-	static public final String ATTR_MEAN_VALUE = "mean-value";
-
-	static public final String ATTR_ERROR_MARGIN = "error-margin";
-
-	static public final String ATTR_ERROR_LOWER_LIMIT = "error-lower-limit";
-
-	static public final String ATTR_ERROR_UPPER_LIMIT = "error-upper-limit";
-
-	static public final String ATTR_ERROR_CATEGORY = "error-category";
-
-	static public final String ATTR_ERROR_PERCENTAGE = "error-percentage";
-
-	static public final String ATTR_REGRESSION_TYPE = "regression-type";
-
-	static public final String ATTR_DATA_LABEL_NUMBER = "data-label-number";
-
-	static public final String ATTR_DATA_LABEL_TEXT = "data-label-text";
-
-	static public final String ATTR_DATA_LABEL_SYMBOL = "data-label-symbol";
-
-	static public final String ATTR_DISPLAY_LABEL = "display-label";
-
-	static public final String ATTR_TICK_MARKS_MAJOR_INNER = "tick-marks-major-inner";
-
-	static public final String ATTR_TICK_MARKS_MAJOR_OUTER = "tick-marks-major-outer";
-
-	static public final String ATTR_LOGARITHMIC = "logarithmic";
-
-	static public final String ATTR_TEXT_OVERLAP = "text-overlap";
-
-	static public final String ATTR_LABEL_ARRANGEMENT = "label-arrangement";
-
-	static public final String ATTR_VISIBLE = "visible";
-
-	static public final String ATTR_ORIGIN = "origin";
-
-	static public final String ATTR_GAP_WIDTH = "gap-width";
-
-	static public final String ATTR_OVERLAP = "overlap";
-
-	static public final String ATTR_SOLID_TYPE = "solid-type";
-
-	static public final String ATTR_ATTACHED_AXIS = "attached-axis";
-
-	static public final String ATTR_MINIMUM = "minimum";
-
-	static public final String ATTR_MAXIMUM = "maximum";
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/ChartElement.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/ChartElement.java
deleted file mode 100644
index f1940f3..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/ChartElement.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.chart;
-
-import org.eclipse.actf.model.dom.odf.base.ODFElement;
-import org.eclipse.actf.model.dom.odf.content.IStylable;
-
-/**
- * Interface for &lt;chart:chart&gt; element.
- */
-public interface ChartElement extends ODFElement, IStylable {
-	/**
-	 * Return svg:width attribute
-	 * 
-	 * @return String
-	 */		
-	public String getAttrSvgWidth();
-
-	/**
-	 * Return svg:height attribute
-	 * 
-	 * @return String
-	 */		
-	public String getAttrSvgHeight();
-
-	/**
-	 * Return chart:class attribute
-	 * 
-	 * @return String
-	 */		
-	public String getAttrChartClass();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/DataPointElement.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/DataPointElement.java
deleted file mode 100644
index 560db59..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/DataPointElement.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.chart;
-
-import org.eclipse.actf.model.dom.odf.base.ODFElement;
-
-/**
- * Interface for &lt;chart:data-point&gt; element.
- */
-public interface DataPointElement extends ODFElement {
-	/**
-	 * Return chart:repeated attribute
-	 * 
-	 * @return int
-	 */		
-	public int getAttrChartRepeated();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/FloorElement.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/FloorElement.java
deleted file mode 100644
index f8ca19e..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/FloorElement.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.chart;
-
-import org.eclipse.actf.model.dom.odf.base.ODFElement;
-import org.eclipse.actf.model.dom.odf.content.IStylable;
-
-/**
- * Interface for &lt;chart:floor&gt; element.
- */
-public interface FloorElement extends ODFElement, IStylable {
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/GridElement.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/GridElement.java
deleted file mode 100644
index 53721c3..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/GridElement.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.chart;
-
-import org.eclipse.actf.model.dom.odf.base.ODFElement;
-import org.eclipse.actf.model.dom.odf.content.IStylable;
-
-/**
- * Interface for &lt;chart:grid&gt; element.
- */
-public interface GridElement extends ODFElement, IStylable {
-	/**
-	 * Return chart:class attribute
-	 * 
-	 * @return String
-	 */		
-	public String getAttrChartClass();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/LegendElement.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/LegendElement.java
deleted file mode 100644
index 2d03d0b..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/LegendElement.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.chart;
-
-import org.eclipse.actf.model.dom.odf.base.ODFElement;
-import org.eclipse.actf.model.dom.odf.content.IStylable;
-
-/**
- * Interface for &lt;chart:legend&gt; element.
- */
-public interface LegendElement extends ODFElement, IStylable {
-	/**
-	 * Return svg:x attribute
-	 * 
-	 * @return String
-	 */			
-	public String getAttrSvgX();
-
-	/**
-	 * Return svg:y attribute
-	 * 
-	 * @return String
-	 */			
-	public String getAttrSvgY();
-
-	/**
-	 * Return chart:legend-position attribute
-	 * 
-	 * @return String
-	 */			
-	public String getAttrChartLegendPosition();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/PlotAreaElement.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/PlotAreaElement.java
deleted file mode 100644
index 46a2142..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/PlotAreaElement.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.chart;
-
-import org.eclipse.actf.model.dom.odf.base.ODFElement;
-import org.eclipse.actf.model.dom.odf.content.IStylable;
-
-/**
- * Interface for &lt;chart:plot-area&gt; element.
- */
-public interface PlotAreaElement extends ODFElement, IStylable {
-	/**
-	 * Return table:cell-range-address attribute
-	 * 
-	 * @return String
-	 */	
-	public String getAttrTableCellRangeAddress();
-
-	/**
-	 * Return chart:data-source-has-labels attribute
-	 * 
-	 * @return String
-	 */		
-	public String getAttrChartDataSourceHasLabels();
-
-	/**
-	 * Return chart:table-number-list attribute
-	 * 
-	 * @return String
-	 */		
-	public String getAttrChartTableNumberList();
-
-	/**
-	 * Return svg:x attribute
-	 * 
-	 * @return String
-	 */		
-	public String getAttrSvgX();
-
-	/**
-	 * Return svg:y attribute
-	 * 
-	 * @return String
-	 */	
-	public String getAttrSvgY();
-
-	/**
-	 * Return svg:width attribute
-	 * 
-	 * @return String
-	 */	
-	public String getAttrSvgWidth();
-
-	/**
-	 * Return svg:height attribute
-	 * 
-	 * @return String
-	 */		
-	public String getAttrSvgHeight();
-
-	/**
-	 * Return dr3d:vrp attribute
-	 * 
-	 * @return String
-	 */		
-	public String getAttrDr3dVrp();
-
-	/**
-	 * Return dr3d:vpn attribute
-	 * 
-	 * @return String
-	 */	
-	public String getAttrDr3dVpn();
-
-	/**
-	 * Return dr3d:vup attribute
-	 * 
-	 * @return String
-	 */	
-	public String getAttrDr3dVup();
-
-	/**
-	 * Return dr3d:projection attribute
-	 * 
-	 * @return String
-	 */		
-	public String getAttrDr3dProjection();
-
-	/**
-	 * Return dr3d:distance attribute
-	 * 
-	 * @return String
-	 */		
-	public String getAttrDr3dDistance();
-
-	/**
-	 * Return dr3d:focal-length attribute
-	 * 
-	 * @return String
-	 */		
-	public String getAttrDr3dFocalLength();
-
-	/**
-	 * Return dr3d:shadow-slant attribute
-	 * 
-	 * @return String
-	 */	
-	public int getAttrDr3dShadowSlant();
-
-	/**
-	 * Return dr3d:shade-mode attribute
-	 * 
-	 * @return String
-	 */		
-	public String getAttrDr3dShadeMode();
-
-	/**
-	 * Return dr3d:ambient-color attribute
-	 * 
-	 * @return String
-	 */		
-	public String getAttrDr3dAmbientColor();
-
-	/**
-	 * Return dr3d:lighting-mode attribute
-	 * 
-	 * @return boolean
-	 */		
-	public boolean getAttrDr3dLightingMode();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/SeriesElement.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/SeriesElement.java
deleted file mode 100644
index 4e1017a..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/SeriesElement.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.chart;
-
-import org.eclipse.actf.model.dom.odf.base.ODFElement;
-import org.eclipse.actf.model.dom.odf.content.IStylable;
-
-/**
- * Interface for &lt;chart:series&gt; element.
- */
-public interface SeriesElement extends ODFElement, IStylable {
-	/**
-	 * Return chart:attached-axis attribute
-	 * 
-	 * @return String
-	 */			
-	public String getAttrChartAttachedAxis();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/StockGainMarkerElement.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/StockGainMarkerElement.java
deleted file mode 100644
index 274ff38..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/StockGainMarkerElement.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.chart;
-
-import org.eclipse.actf.model.dom.odf.base.ODFElement;
-import org.eclipse.actf.model.dom.odf.content.IStylable;
-
-/**
- * Interface for &lt;chart:stock-gain-marker&gt; element.
- */
-public interface StockGainMarkerElement extends ODFElement, IStylable {
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/StockLossMarkerElement.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/StockLossMarkerElement.java
deleted file mode 100644
index 68a9791..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/StockLossMarkerElement.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.chart;
-
-import org.eclipse.actf.model.dom.odf.base.ODFElement;
-import org.eclipse.actf.model.dom.odf.content.IStylable;
-
-/**
- * Interface for &lt;chart:stock-loss-marker&gt; element.
- */
-public interface StockLossMarkerElement extends ODFElement, IStylable {
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/StockRangeLineElement.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/StockRangeLineElement.java
deleted file mode 100644
index 8f071e0..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/StockRangeLineElement.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.chart;
-
-import org.eclipse.actf.model.dom.odf.base.ODFElement;
-import org.eclipse.actf.model.dom.odf.content.IStylable;
-
-/**
- * Interface for &lt;chart:stock-range-line&gt; element.
- */
-public interface StockRangeLineElement extends ODFElement, IStylable {
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/TitleElement.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/TitleElement.java
deleted file mode 100644
index 0e99c38..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/TitleElement.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.chart;
-
-import org.eclipse.actf.model.dom.odf.base.ODFElement;
-import org.eclipse.actf.model.dom.odf.content.IEditable;
-import org.eclipse.actf.model.dom.odf.content.IStylable;
-
-/**
- * Interface for &lt;chart:title&gt; element.
- */
-public interface TitleElement extends ODFElement, IStylable, IEditable {
-	/**
-	 * Return svg:x attribute
-	 * 
-	 * @return String
-	 */	
-	public String getAttrSvgX();
-
-	/**
-	 * Return svg:y attribute
-	 * 
-	 * @return String
-	 */	
-	public String getAttrSvgY();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/WallElement.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/WallElement.java
deleted file mode 100644
index 83b2355..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/WallElement.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.chart;
-
-import org.eclipse.actf.model.dom.odf.base.ODFElement;
-import org.eclipse.actf.model.dom.odf.content.IStylable;
-
-/**
- * Interface for &lt;chart:wall&gt; element.
- */
-public interface WallElement extends ODFElement, IStylable {
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/impl/AxisElementImpl.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/impl/AxisElementImpl.java
deleted file mode 100644
index 00f2a22..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/impl/AxisElementImpl.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.chart.impl;
-
-import org.eclipse.actf.model.dom.odf.base.ODFDocument;
-import org.eclipse.actf.model.dom.odf.base.impl.ODFStylableElementImpl;
-import org.eclipse.actf.model.dom.odf.chart.AxisElement;
-import org.eclipse.actf.model.dom.odf.chart.ChartConstants;
-import org.w3c.dom.Element;
-
-
-class AxisElementImpl extends ODFStylableElementImpl implements AxisElement {
-	private static final long serialVersionUID = 7482924035365697274L;
-
-	protected AxisElementImpl(ODFDocument odfDoc, Element element) {
-		super(odfDoc, element);
-	}
-
-	public String getAttrChartDimension() {
-		if (hasAttributeNS(ChartConstants.CHART_NAMESPACE_URI,
-				ChartConstants.ATTR_DIMENSION))
-			return getAttributeNS(ChartConstants.CHART_NAMESPACE_URI,
-					ChartConstants.ATTR_DIMENSION);
-		return null;
-	}
-
-	public String getAttrChartName() {
-		if (hasAttributeNS(ChartConstants.CHART_NAMESPACE_URI,
-				ChartConstants.ATTR_NAME))
-			return getAttributeNS(ChartConstants.CHART_NAMESPACE_URI,
-					ChartConstants.ATTR_NAME);
-		return null;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/impl/CategoriesElementImpl.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/impl/CategoriesElementImpl.java
deleted file mode 100644
index e872e3a..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/impl/CategoriesElementImpl.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.chart.impl;
-
-import org.eclipse.actf.model.dom.odf.base.ODFDocument;
-import org.eclipse.actf.model.dom.odf.base.impl.ODFElementImpl;
-import org.eclipse.actf.model.dom.odf.chart.CategoriesElement;
-import org.eclipse.actf.model.dom.odf.table.TableConstants;
-import org.w3c.dom.Element;
-
-
-class CategoriesElementImpl extends ODFElementImpl implements CategoriesElement {
-	private static final long serialVersionUID = 5039431012784927768L;
-
-	protected CategoriesElementImpl(ODFDocument odfDoc, Element element) {
-		super(odfDoc, element);
-	}
-
-	public String getAttrTableCellRangeAddress() {
-		if (hasAttributeNS(TableConstants.TABLE_NAMESPACE_URI,
-				TableConstants.ATTR_CELL_RANGE_ADDRESS))
-			return getAttributeNS(TableConstants.TABLE_NAMESPACE_URI,
-					TableConstants.ATTR_CELL_RANGE_ADDRESS);
-		return null;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/impl/ChartElementImpl.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/impl/ChartElementImpl.java
deleted file mode 100644
index f9fed94..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/impl/ChartElementImpl.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.chart.impl;
-
-import org.eclipse.actf.model.dom.odf.base.ODFDocument;
-import org.eclipse.actf.model.dom.odf.base.impl.ODFStylableElementImpl;
-import org.eclipse.actf.model.dom.odf.chart.ChartConstants;
-import org.eclipse.actf.model.dom.odf.chart.ChartElement;
-import org.eclipse.actf.model.dom.odf.svg.SVGConstants;
-import org.w3c.dom.Element;
-
-
-class ChartElementImpl extends ODFStylableElementImpl implements ChartElement {
-	private static final long serialVersionUID = 8422349783806697219L;
-
-	protected ChartElementImpl(ODFDocument odfDoc, Element element) {
-		super(odfDoc, element);
-	}
-
-	public String getAttrSvgWidth() {
-		if (hasAttributeNS(SVGConstants.SVG_NAMESPACE_URI,
-				SVGConstants.ATTR_WIDTH))
-			return getAttributeNS(SVGConstants.SVG_NAMESPACE_URI,
-					SVGConstants.ATTR_WIDTH);
-		return null;
-	}
-
-	public String getAttrSvgHeight() {
-		if (hasAttributeNS(SVGConstants.SVG_NAMESPACE_URI,
-				SVGConstants.ATTR_HEIGHT))
-			return getAttributeNS(SVGConstants.SVG_NAMESPACE_URI,
-					SVGConstants.ATTR_HEIGHT);
-		return null;
-	}
-
-	public String getAttrChartClass() {
-		if (hasAttributeNS(ChartConstants.CHART_NAMESPACE_URI,
-				ChartConstants.ATTR_CLASS))
-			return getAttributeNS(ChartConstants.CHART_NAMESPACE_URI,
-					ChartConstants.ATTR_CLASS);
-		return null;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/impl/ChartNodeFactory.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/impl/ChartNodeFactory.java
deleted file mode 100644
index 718a50c..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/impl/ChartNodeFactory.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.chart.impl;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.actf.model.dom.odf.base.ODFDocument;
-import org.eclipse.actf.model.dom.odf.base.ODFElement;
-import org.eclipse.actf.model.dom.odf.base.impl.AbstractODFNodeFactory;
-import org.eclipse.actf.model.dom.odf.chart.ChartConstants;
-import org.w3c.dom.Element;
-
-public class ChartNodeFactory extends AbstractODFNodeFactory {
-	private static final Map<String, Class<? extends ODFElement>> tagMap = new HashMap<String, Class<? extends ODFElement>>();
-
-	static {
-		tagMap.put(ChartConstants.ELEMENT_CHART, ChartElementImpl.class);
-		tagMap.put(ChartConstants.ELEMENT_TITLE, TitleElementImpl.class);
-		tagMap.put(ChartConstants.ELEMENT_LEGEND, LegendElementImpl.class);
-		tagMap.put(ChartConstants.ELEMENT_PLOT_AREA, PlotAreaElementImpl.class);
-		tagMap.put(ChartConstants.ELEMENT_AXIS, AxisElementImpl.class);
-		tagMap.put(ChartConstants.ELEMENT_CATEGORIES,
-				CategoriesElementImpl.class);
-		tagMap.put(ChartConstants.ELEMENT_GRID, GridElementImpl.class);
-		tagMap.put(ChartConstants.ELEMENT_SERIES, SeriesElementImpl.class);
-		tagMap.put(ChartConstants.ELEMENT_DATA_POINT,
-				DataPointElementImpl.class);
-		tagMap.put(ChartConstants.ELEMENT_STOCK_GAIN_MARKER,
-				StockGainMarkerElementImpl.class);
-		tagMap.put(ChartConstants.ELEMENT_STOCK_LOSS_MARKER,
-				StockLossMarkerElementImpl.class);
-		tagMap.put(ChartConstants.ELEMENT_STOCK_RANGE_LINE,
-				StockRangeLineElementImpl.class);
-		tagMap.put(ChartConstants.ELEMENT_WALL, WallElementImpl.class);
-		tagMap.put(ChartConstants.ELEMENT_FLOOR, FloorElementImpl.class);
-	}
-
-	public static Element createElement(ODFDocument odfDoc, String tagName,
-			Element element) {
-		Class<? extends ODFElement> cs = tagMap.get(tagName);
-		if (null == cs) {
-			return null;
-		}
-
-		try {
-			return findElementConstractor(cs).newInstance(
-					new Object[] { odfDoc, element });
-		} catch (IllegalArgumentException e) {
-			e.printStackTrace();
-		} catch (InstantiationException e) {
-			e.printStackTrace();
-		} catch (IllegalAccessException e) {
-			e.printStackTrace();
-		} catch (InvocationTargetException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/impl/DataPointElementImpl.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/impl/DataPointElementImpl.java
deleted file mode 100644
index 805b24d..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/impl/DataPointElementImpl.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.chart.impl;
-
-import org.eclipse.actf.model.dom.odf.base.ODFDocument;
-import org.eclipse.actf.model.dom.odf.base.impl.ODFElementImpl;
-import org.eclipse.actf.model.dom.odf.chart.ChartConstants;
-import org.eclipse.actf.model.dom.odf.chart.DataPointElement;
-import org.w3c.dom.Element;
-
-
-class DataPointElementImpl extends ODFElementImpl implements DataPointElement {
-	private static final long serialVersionUID = -7212238489251171612L;
-
-	protected DataPointElementImpl(ODFDocument odfDoc, Element element) {
-		super(odfDoc, element);
-	}
-
-	public int getAttrChartRepeated() {
-		if (hasAttributeNS(ChartConstants.CHART_NAMESPACE_URI,
-				ChartConstants.ATTR_REPEATED)) {
-			return new Integer(getAttributeNS(
-					ChartConstants.CHART_NAMESPACE_URI,
-					ChartConstants.ATTR_REPEATED)).intValue();
-		}
-		return -1;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/impl/FloorElementImpl.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/impl/FloorElementImpl.java
deleted file mode 100644
index 440ec84..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/impl/FloorElementImpl.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.chart.impl;
-
-import org.eclipse.actf.model.dom.odf.base.ODFDocument;
-import org.eclipse.actf.model.dom.odf.base.impl.ODFStylableElementImpl;
-import org.eclipse.actf.model.dom.odf.chart.FloorElement;
-import org.w3c.dom.Element;
-
-
-class FloorElementImpl extends ODFStylableElementImpl implements FloorElement {
-	private static final long serialVersionUID = -2743316502571280037L;
-
-	protected FloorElementImpl(ODFDocument odfDoc, Element element) {
-		super(odfDoc, element);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/impl/GridElementImpl.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/impl/GridElementImpl.java
deleted file mode 100644
index 862de40..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/impl/GridElementImpl.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.chart.impl;
-
-import org.eclipse.actf.model.dom.odf.base.ODFDocument;
-import org.eclipse.actf.model.dom.odf.base.impl.ODFStylableElementImpl;
-import org.eclipse.actf.model.dom.odf.chart.ChartConstants;
-import org.eclipse.actf.model.dom.odf.chart.GridElement;
-import org.w3c.dom.Element;
-
-
-class GridElementImpl extends ODFStylableElementImpl implements GridElement {
-	private static final long serialVersionUID = 9015855390438998748L;
-
-	protected GridElementImpl(ODFDocument odfDoc, Element element) {
-		super(odfDoc, element);
-	}
-
-	public String getAttrChartClass() {
-		if (hasAttributeNS(ChartConstants.CHART_NAMESPACE_URI,
-				ChartConstants.ATTR_CLASS))
-			return getAttributeNS(ChartConstants.CHART_NAMESPACE_URI,
-					ChartConstants.ATTR_CLASS);
-		return null;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/impl/LegendElementImpl.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/impl/LegendElementImpl.java
deleted file mode 100644
index edf88bf..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/impl/LegendElementImpl.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.chart.impl;
-
-import org.eclipse.actf.model.dom.odf.base.ODFDocument;
-import org.eclipse.actf.model.dom.odf.base.impl.ODFStylableElementImpl;
-import org.eclipse.actf.model.dom.odf.chart.ChartConstants;
-import org.eclipse.actf.model.dom.odf.chart.LegendElement;
-import org.eclipse.actf.model.dom.odf.svg.SVGConstants;
-import org.w3c.dom.Element;
-
-
-class LegendElementImpl extends ODFStylableElementImpl implements LegendElement {
-	private static final long serialVersionUID = 2552292055359445007L;
-
-	protected LegendElementImpl(ODFDocument odfDoc, Element element) {
-		super(odfDoc, element);
-	}
-
-	public String getAttrChartLegendPosition() {
-		if (hasAttributeNS(ChartConstants.CHART_NAMESPACE_URI,
-				ChartConstants.ATTR_LEGEND_POSITION))
-			return getAttributeNS(ChartConstants.CHART_NAMESPACE_URI,
-					ChartConstants.ATTR_LEGEND_POSITION);
-		return null;
-	}
-
-	public String getAttrSvgX() {
-		if (hasAttributeNS(SVGConstants.SVG_NAMESPACE_URI, SVGConstants.ATTR_X))
-			return getAttributeNS(SVGConstants.SVG_NAMESPACE_URI,
-					SVGConstants.ATTR_X);
-		return null;
-	}
-
-	public String getAttrSvgY() {
-		if (hasAttributeNS(SVGConstants.SVG_NAMESPACE_URI, SVGConstants.ATTR_Y))
-			return getAttributeNS(SVGConstants.SVG_NAMESPACE_URI,
-					SVGConstants.ATTR_Y);
-		return null;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/impl/PlotAreaElementImpl.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/impl/PlotAreaElementImpl.java
deleted file mode 100644
index 026f481..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/impl/PlotAreaElementImpl.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.chart.impl;
-
-import org.eclipse.actf.model.dom.odf.base.ODFDocument;
-import org.eclipse.actf.model.dom.odf.base.impl.ODFStylableElementImpl;
-import org.eclipse.actf.model.dom.odf.chart.ChartConstants;
-import org.eclipse.actf.model.dom.odf.chart.PlotAreaElement;
-import org.eclipse.actf.model.dom.odf.dr3d.Dr3dConstants;
-import org.eclipse.actf.model.dom.odf.svg.SVGConstants;
-import org.eclipse.actf.model.dom.odf.table.TableConstants;
-import org.w3c.dom.Element;
-
-
-class PlotAreaElementImpl extends ODFStylableElementImpl implements
-		PlotAreaElement {
-	private static final long serialVersionUID = -4201756033126842992L;
-
-	protected PlotAreaElementImpl(ODFDocument odfDoc, Element element) {
-		super(odfDoc, element);
-	}
-
-	public String getAttrTableCellRangeAddress() {
-		if (hasAttributeNS(TableConstants.TABLE_NAMESPACE_URI,
-				TableConstants.ATTR_CELL_RANGE_ADDRESS))
-			return getAttributeNS(TableConstants.TABLE_NAMESPACE_URI,
-					TableConstants.ATTR_CELL_RANGE_ADDRESS);
-		return null;
-	}
-
-	public String getAttrChartDataSourceHasLabels() {
-		if (hasAttributeNS(ChartConstants.CHART_NAMESPACE_URI,
-				ChartConstants.ATTR_DATA_SOURCE_HAS_LABELS))
-			return getAttributeNS(ChartConstants.CHART_NAMESPACE_URI,
-					ChartConstants.ATTR_DATA_SOURCE_HAS_LABELS);
-		return null;
-	}
-
-	public String getAttrChartTableNumberList() {
-		if (hasAttributeNS(ChartConstants.CHART_NAMESPACE_URI,
-				ChartConstants.ATTR_TABLE_NUMBER_LIST))
-			return getAttributeNS(ChartConstants.CHART_NAMESPACE_URI,
-					ChartConstants.ATTR_TABLE_NUMBER_LIST);
-		return null;
-	}
-
-	public String getAttrSvgX() {
-		if (hasAttributeNS(SVGConstants.SVG_NAMESPACE_URI, SVGConstants.ATTR_X))
-			return getAttributeNS(SVGConstants.SVG_NAMESPACE_URI,
-					SVGConstants.ATTR_X);
-		return null;
-	}
-
-	public String getAttrSvgY() {
-		if (hasAttributeNS(SVGConstants.SVG_NAMESPACE_URI, SVGConstants.ATTR_Y))
-			return getAttributeNS(SVGConstants.SVG_NAMESPACE_URI,
-					SVGConstants.ATTR_Y);
-		return null;
-	}
-
-	public String getAttrSvgWidth() {
-		if (hasAttributeNS(SVGConstants.SVG_NAMESPACE_URI,
-				SVGConstants.ATTR_WIDTH))
-			return getAttributeNS(SVGConstants.SVG_NAMESPACE_URI,
-					SVGConstants.ATTR_WIDTH);
-		return null;
-	}
-
-	public String getAttrSvgHeight() {
-		if (hasAttributeNS(SVGConstants.SVG_NAMESPACE_URI,
-				SVGConstants.ATTR_HEIGHT))
-			return getAttributeNS(SVGConstants.SVG_NAMESPACE_URI,
-					SVGConstants.ATTR_HEIGHT);
-		return null;
-	}
-
-	public String getAttrDr3dVrp() {
-		if (hasAttributeNS(Dr3dConstants.DR3D_NAMESPACE_URI,
-				Dr3dConstants.ATTR_VRP))
-			return getAttributeNS(Dr3dConstants.DR3D_NAMESPACE_URI,
-					Dr3dConstants.ATTR_VRP);
-		return null;
-	}
-
-	public String getAttrDr3dVpn() {
-		if (hasAttributeNS(Dr3dConstants.DR3D_NAMESPACE_URI,
-				Dr3dConstants.ATTR_VPN))
-			return getAttributeNS(Dr3dConstants.DR3D_NAMESPACE_URI,
-					Dr3dConstants.ATTR_VPN);
-		return null;
-	}
-
-	public String getAttrDr3dVup() {
-		if (hasAttributeNS(Dr3dConstants.DR3D_NAMESPACE_URI,
-				Dr3dConstants.ATTR_VUP))
-			return getAttributeNS(Dr3dConstants.DR3D_NAMESPACE_URI,
-					Dr3dConstants.ATTR_VUP);
-		return null;
-	}
-
-	public String getAttrDr3dProjection() {
-		if (hasAttributeNS(Dr3dConstants.DR3D_NAMESPACE_URI,
-				Dr3dConstants.ATTR_PROJECTION))
-			return getAttributeNS(Dr3dConstants.DR3D_NAMESPACE_URI,
-					Dr3dConstants.ATTR_PROJECTION);
-		return null;
-	}
-
-	public String getAttrDr3dDistance() {
-		if (hasAttributeNS(Dr3dConstants.DR3D_NAMESPACE_URI,
-				Dr3dConstants.ATTR_DISTANCE))
-			return getAttributeNS(Dr3dConstants.DR3D_NAMESPACE_URI,
-					Dr3dConstants.ATTR_DISTANCE);
-		return null;
-	}
-
-	public String getAttrDr3dFocalLength() {
-		if (hasAttributeNS(Dr3dConstants.DR3D_NAMESPACE_URI,
-				Dr3dConstants.ATTR_FOCAL_LENGTH))
-			return getAttributeNS(Dr3dConstants.DR3D_NAMESPACE_URI,
-					Dr3dConstants.ATTR_FOCAL_LENGTH);
-		return null;
-	}
-
-	public int getAttrDr3dShadowSlant() {
-		if (hasAttributeNS(Dr3dConstants.DR3D_NAMESPACE_URI,
-				Dr3dConstants.ATTR_SHADOW_SLANT)) {
-			return new Integer(getAttributeNS(Dr3dConstants.DR3D_NAMESPACE_URI,
-					Dr3dConstants.ATTR_SHADOW_SLANT)).intValue();
-		}
-		return -1;
-	}
-
-	public String getAttrDr3dShadeMode() {
-		if (hasAttributeNS(Dr3dConstants.DR3D_NAMESPACE_URI,
-				Dr3dConstants.ATTR_SHADE_MODE))
-			return getAttributeNS(Dr3dConstants.DR3D_NAMESPACE_URI,
-					Dr3dConstants.ATTR_SHADE_MODE);
-		return null;
-	}
-
-	public String getAttrDr3dAmbientColor() {
-		if (hasAttributeNS(Dr3dConstants.DR3D_NAMESPACE_URI,
-				Dr3dConstants.ATTR_AMBIENT_COLOR))
-			return getAttributeNS(Dr3dConstants.DR3D_NAMESPACE_URI,
-					Dr3dConstants.ATTR_AMBIENT_COLOR);
-		return null;
-	}
-
-	public boolean getAttrDr3dLightingMode() {
-		if (hasAttributeNS(Dr3dConstants.DR3D_NAMESPACE_URI,
-				Dr3dConstants.ATTR_LIGHTING_MODE)) {
-			return new Boolean(getAttributeNS(Dr3dConstants.DR3D_NAMESPACE_URI,
-					Dr3dConstants.ATTR_LIGHTING_MODE)).booleanValue();
-		}
-		return false;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/impl/SeriesElementImpl.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/impl/SeriesElementImpl.java
deleted file mode 100644
index faeb64c..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/impl/SeriesElementImpl.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.chart.impl;
-
-import org.eclipse.actf.model.dom.odf.base.ODFDocument;
-import org.eclipse.actf.model.dom.odf.base.impl.ODFStylableElementImpl;
-import org.eclipse.actf.model.dom.odf.chart.ChartConstants;
-import org.eclipse.actf.model.dom.odf.chart.SeriesElement;
-import org.w3c.dom.Element;
-
-
-class SeriesElementImpl extends ODFStylableElementImpl implements SeriesElement {
-	private static final long serialVersionUID = 8895859924207061489L;
-
-	protected SeriesElementImpl(ODFDocument odfDoc, Element element) {
-		super(odfDoc, element);
-	}
-
-	public String getAttrChartAttachedAxis() {
-		if (hasAttributeNS(ChartConstants.CHART_NAMESPACE_URI,
-				ChartConstants.ATTR_ATTACHED_AXIS))
-			return getAttributeNS(ChartConstants.CHART_NAMESPACE_URI,
-					ChartConstants.ATTR_ATTACHED_AXIS);
-		return null;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/impl/StockGainMarkerElementImpl.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/impl/StockGainMarkerElementImpl.java
deleted file mode 100644
index 3e5d118..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/impl/StockGainMarkerElementImpl.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.chart.impl;
-
-import org.eclipse.actf.model.dom.odf.base.ODFDocument;
-import org.eclipse.actf.model.dom.odf.base.impl.ODFStylableElementImpl;
-import org.eclipse.actf.model.dom.odf.chart.StockGainMarkerElement;
-import org.w3c.dom.Element;
-
-
-class StockGainMarkerElementImpl extends ODFStylableElementImpl implements
-		StockGainMarkerElement {
-	private static final long serialVersionUID = 94628094501082890L;
-
-	protected StockGainMarkerElementImpl(ODFDocument odfDoc, Element element) {
-		super(odfDoc, element);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/impl/StockLossMarkerElementImpl.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/impl/StockLossMarkerElementImpl.java
deleted file mode 100644
index 6139f07..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/impl/StockLossMarkerElementImpl.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.chart.impl;
-
-import org.eclipse.actf.model.dom.odf.base.ODFDocument;
-import org.eclipse.actf.model.dom.odf.base.impl.ODFStylableElementImpl;
-import org.eclipse.actf.model.dom.odf.chart.StockLossMarkerElement;
-import org.w3c.dom.Element;
-
-
-class StockLossMarkerElementImpl extends ODFStylableElementImpl implements
-		StockLossMarkerElement {
-	private static final long serialVersionUID = -7652086194738893078L;
-
-	protected StockLossMarkerElementImpl(ODFDocument odfDoc, Element element) {
-		super(odfDoc, element);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/impl/StockRangeLineElementImpl.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/impl/StockRangeLineElementImpl.java
deleted file mode 100644
index 7947aff..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/impl/StockRangeLineElementImpl.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.chart.impl;
-
-import org.eclipse.actf.model.dom.odf.base.ODFDocument;
-import org.eclipse.actf.model.dom.odf.base.impl.ODFStylableElementImpl;
-import org.eclipse.actf.model.dom.odf.chart.StockRangeLineElement;
-import org.w3c.dom.Element;
-
-
-class StockRangeLineElementImpl extends ODFStylableElementImpl implements
-		StockRangeLineElement {
-	private static final long serialVersionUID = 6328237457664667672L;
-
-	protected StockRangeLineElementImpl(ODFDocument odfDoc, Element element) {
-		super(odfDoc, element);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/impl/TitleElementImpl.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/impl/TitleElementImpl.java
deleted file mode 100644
index 6131fbf..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/impl/TitleElementImpl.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.chart.impl;
-
-import org.eclipse.actf.model.dom.odf.base.ODFDocument;
-import org.eclipse.actf.model.dom.odf.base.impl.ODFStylableElementImpl;
-import org.eclipse.actf.model.dom.odf.chart.TitleElement;
-import org.eclipse.actf.model.dom.odf.content.IEditListener;
-import org.eclipse.actf.model.dom.odf.content.IEditable;
-import org.eclipse.actf.model.dom.odf.svg.SVGConstants;
-import org.w3c.dom.Element;
-
-
-class TitleElementImpl extends ODFStylableElementImpl implements TitleElement {
-	private static final long serialVersionUID = 4722975487761185402L;
-
-	protected TitleElementImpl(ODFDocument odfDoc, Element element) {
-		super(odfDoc, element);
-	}
-
-	public String getAttrSvgX() {
-		if (hasAttributeNS(SVGConstants.SVG_NAMESPACE_URI, SVGConstants.ATTR_X))
-			return getAttributeNS(SVGConstants.SVG_NAMESPACE_URI,
-					SVGConstants.ATTR_X);
-		return null;
-	}
-
-	public String getAttrSvgY() {
-		if (hasAttributeNS(SVGConstants.SVG_NAMESPACE_URI, SVGConstants.ATTR_Y))
-			return getAttributeNS(SVGConstants.SVG_NAMESPACE_URI,
-					SVGConstants.ATTR_Y);
-		return null;
-	}
-
-	public Object getValue() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public void setValue(Object data) {
-		// TODO Auto-generated method stub
-
-	}
-
-	public void remove() {
-		// TODO Auto-generated method stub
-
-	}
-
-	public void insert(IEditable data) {
-		// TODO Auto-generated method stub
-
-	}
-
-	public void addEditListener(IEditListener observer, String topic) {
-		// TODO Auto-generated method stub
-
-	}
-
-	public void removeEditListener(IEditListener observer, String topic) {
-		// TODO Auto-generated method stub
-
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/impl/WallElementImpl.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/impl/WallElementImpl.java
deleted file mode 100644
index cea581c..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/impl/WallElementImpl.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.chart.impl;
-
-import org.eclipse.actf.model.dom.odf.base.ODFDocument;
-import org.eclipse.actf.model.dom.odf.base.impl.ODFStylableElementImpl;
-import org.eclipse.actf.model.dom.odf.chart.WallElement;
-import org.w3c.dom.Element;
-
-
-class WallElementImpl extends ODFStylableElementImpl implements WallElement {
-	private static final long serialVersionUID = -8689660934999539135L;
-
-	protected WallElementImpl(ODFDocument odfDoc, Element element) {
-		super(odfDoc, element);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/package-info.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/package-info.java
deleted file mode 100644
index bb4f514..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/chart/package-info.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Kentarou FUKUDA - initial API and implementation
- *******************************************************************************/
-
-/**
- * This package contains interfaces and constants of ODF chart namespace.
- * Chart namespace contains elements and attributes that describe chart content.
- */
-package org.eclipse.actf.model.dom.odf.chart;
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/content/IEditListener.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/content/IEditListener.java
deleted file mode 100644
index bef0070..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/content/IEditListener.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.content;
-
-/**
- * Listener class to detect ODF content change should implement this interface.
- * Currently this interface is not implemented yet.
- */ 
-public interface IEditListener {
-	public void onEdit(IEditable target, String topic);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/content/IEditable.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/content/IEditable.java
deleted file mode 100644
index fc960ef..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/content/IEditable.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.content;
-
-/**
- * ODF elements that have text contents should implements this interface.
- */
-public interface IEditable {
-	public Object getValue();
-
-	public void setValue(Object data);
-
-	public void remove();
-
-	public void insert(IEditable data);
-
-	public void addEditListener(IEditListener observer, String topic);
-
-	public void removeEditListener(IEditListener observer, String topic);
-}
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/content/IStylable.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/content/IStylable.java
deleted file mode 100644
index c6a2ee1..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/content/IStylable.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.content;
-
-import org.eclipse.actf.model.dom.odf.style.StyleElement;
-
-/**
- * ODF elements that refers style elements should implements this interface.
- */
-public interface IStylable {
-	public void setStyle(StyleElement style);
-
-	public StyleElement getStyle();
-
-	public void addStyleListener(IStyleListener listener, String topic);
-
-	public void removeStyleListener(IStyleListener listener, String topic);
-}
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/content/IStyleListener.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/content/IStyleListener.java
deleted file mode 100644
index 3219548..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/content/IStyleListener.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.content;
-
-/**
- * Listener class to detect ODF style change should implement this interface.
- * Currently this interface is not implemented yet.
- */
-public interface IStyleListener {
-	public void onStyle(IStylable target, String topic);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/content/package-info.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/content/package-info.java
deleted file mode 100644
index ac0103f..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/content/package-info.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Kentarou FUKUDA - initial API and implementation
- *******************************************************************************/
-
-/**
- * This package contains interfaces of ODF text and graphics contents.
- */
-package org.eclipse.actf.model.dom.odf.content;
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/dr3d/Dr3dConstants.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/dr3d/Dr3dConstants.java
deleted file mode 100644
index 2f78378..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/dr3d/Dr3dConstants.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.dr3d;
-
-/**
- * Dr3dConstants defines the constant values used by dr3d namespace of ODF DOM API
- */
-@SuppressWarnings("nls")
-public final class Dr3dConstants {
-	static public final String DR3D_NAMESPACE_URI = "urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0";
-
-	static public final String ELEMENT_LIGHT = "light";
-
-	static public final String ELEMENT_SCENE = "scene";
-
-	static public final String ATTR_DIFFUSE_COLOR = "diffuse-color";
-
-	static public final String ATTR_DIRECTION = "direction";
-
-	static public final String ATTR_ENABLED = "enabled";
-
-	static public final String ATTR_SPECULAR = "specular";
-
-	static public final String ATTR_VRP = "vrp";
-
-	static public final String ATTR_VPN = "vpn";
-
-	static public final String ATTR_VUP = "vup";
-
-	static public final String ATTR_PROJECTION = "projection";
-
-	static public final String ATTR_DISTANCE = "distance";
-
-	static public final String ATTR_FOCAL_LENGTH = "focal-length";
-
-	static public final String ATTR_SHADOW_SLANT = "shadow-slant";
-
-	static public final String ATTR_SHADE_MODE = "shade-mode";
-
-	static public final String ATTR_AMBIENT_COLOR = "ambient-color";
-
-	static public final String ATTR_LIGHTING_MODE = "lighting-mode";
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/dr3d/LightElement.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/dr3d/LightElement.java
deleted file mode 100644
index 65f7c55..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/dr3d/LightElement.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.dr3d;
-
-import org.eclipse.actf.model.dom.odf.base.ODFElement;
-
-/**
- * Interface for &lt;dr3d:light&gt; element.
- */
-public interface LightElement extends ODFElement {
-	/**
-	 * Return dr3d:diffuse-color attribute
-	 * 
-	 * @return String
-	 */		
-	public String getAttrDr3dDiffuseColor();
-
-	/**
-	 * Return dr3d:direction attribute
-	 * 
-	 * @return String
-	 */		
-	public String getAttrDr3dDirection();
-
-	/**
-	 * Return dr3d:enabled attribute
-	 * 
-	 * @return String
-	 */		
-	public boolean getAttrDr3dEnabled();
-
-	/**
-	 * Return dr3d:specular attribute
-	 * 
-	 * @return String
-	 */		
-	public boolean getAttrDr3dSpecular();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/dr3d/SceneElement.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/dr3d/SceneElement.java
deleted file mode 100644
index 4beaed5..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/dr3d/SceneElement.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.dr3d;
-
-import org.eclipse.actf.model.dom.odf.base.DrawingObjectElement;
-
-/**
- * Interface for &lt;dr3d:scene&gt; element.
- */
-public interface SceneElement extends DrawingObjectElement {
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/dr3d/impl/Dr3dNodeFactory.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/dr3d/impl/Dr3dNodeFactory.java
deleted file mode 100644
index fdfe14f..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/dr3d/impl/Dr3dNodeFactory.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.dr3d.impl;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.actf.model.dom.odf.base.ODFDocument;
-import org.eclipse.actf.model.dom.odf.base.ODFElement;
-import org.eclipse.actf.model.dom.odf.base.impl.AbstractODFNodeFactory;
-import org.eclipse.actf.model.dom.odf.dr3d.Dr3dConstants;
-import org.w3c.dom.Element;
-
-public class Dr3dNodeFactory extends AbstractODFNodeFactory {
-	private static final Map<String, Class<? extends ODFElement>> tagMap = new HashMap<String, Class<? extends ODFElement>>();
-
-	static {
-		tagMap.put(Dr3dConstants.ELEMENT_LIGHT, LightElementImpl.class);
-		tagMap.put(Dr3dConstants.ELEMENT_SCENE, SceneElementImpl.class);
-	}
-
-	public static Element createElement(ODFDocument odfDoc, String tagName,
-			Element element) {
-		Class<? extends ODFElement> cs = tagMap.get(tagName);
-		if (null == cs) {
-			return null;
-		}
-
-		try {
-			return findElementConstractor(cs).newInstance(
-					new Object[] { odfDoc, element });
-		} catch (IllegalArgumentException e) {
-			e.printStackTrace();
-		} catch (InstantiationException e) {
-			e.printStackTrace();
-		} catch (IllegalAccessException e) {
-			e.printStackTrace();
-		} catch (InvocationTargetException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/dr3d/impl/LightElementImpl.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/dr3d/impl/LightElementImpl.java
deleted file mode 100644
index 8e9eca3..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/dr3d/impl/LightElementImpl.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.dr3d.impl;
-
-import org.eclipse.actf.model.dom.odf.base.ODFDocument;
-import org.eclipse.actf.model.dom.odf.base.impl.ODFElementImpl;
-import org.eclipse.actf.model.dom.odf.dr3d.Dr3dConstants;
-import org.eclipse.actf.model.dom.odf.dr3d.LightElement;
-import org.w3c.dom.Element;
-
-
-class LightElementImpl extends ODFElementImpl implements LightElement {
-	private static final long serialVersionUID = -6265631982423831275L;
-
-	protected LightElementImpl(ODFDocument odfDoc, Element element) {
-		super(odfDoc, element);
-	}
-
-	public String getAttrDr3dDiffuseColor() {
-		if (hasAttributeNS(Dr3dConstants.DR3D_NAMESPACE_URI,
-				Dr3dConstants.ATTR_DIFFUSE_COLOR))
-			return getAttributeNS(Dr3dConstants.DR3D_NAMESPACE_URI,
-					Dr3dConstants.ATTR_DIFFUSE_COLOR);
-		return null;
-	}
-
-	public String getAttrDr3dDirection() {
-		if (hasAttributeNS(Dr3dConstants.DR3D_NAMESPACE_URI,
-				Dr3dConstants.ATTR_DIRECTION))
-			return getAttributeNS(Dr3dConstants.DR3D_NAMESPACE_URI,
-					Dr3dConstants.ATTR_DIRECTION);
-		return null;
-	}
-
-	public boolean getAttrDr3dEnabled() {
-		if (hasAttributeNS(Dr3dConstants.DR3D_NAMESPACE_URI,
-				Dr3dConstants.ATTR_ENABLED)) {
-			return new Boolean(getAttributeNS(Dr3dConstants.DR3D_NAMESPACE_URI,
-					Dr3dConstants.ATTR_ENABLED)).booleanValue();
-		}
-		return false;
-	}
-
-	public boolean getAttrDr3dSpecular() {
-		if (hasAttributeNS(Dr3dConstants.DR3D_NAMESPACE_URI,
-				Dr3dConstants.ATTR_SPECULAR)) {
-			return new Boolean(getAttributeNS(Dr3dConstants.DR3D_NAMESPACE_URI,
-					Dr3dConstants.ATTR_SPECULAR)).booleanValue();
-		}
-		return false;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/dr3d/impl/SceneElementImpl.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/dr3d/impl/SceneElementImpl.java
deleted file mode 100644
index 7d380d7..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/dr3d/impl/SceneElementImpl.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.dr3d.impl;
-
-import org.eclipse.actf.model.dom.odf.base.ODFDocument;
-import org.eclipse.actf.model.dom.odf.base.impl.DrawingObjectElementImpl;
-import org.eclipse.actf.model.dom.odf.dr3d.SceneElement;
-import org.w3c.dom.Element;
-
-
-class SceneElementImpl extends DrawingObjectElementImpl implements SceneElement {
-	private static final long serialVersionUID = -7063216214438153965L;
-
-	protected SceneElementImpl(ODFDocument odfDoc, Element element) {
-		super(odfDoc, element);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/dr3d/package-info.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/dr3d/package-info.java
deleted file mode 100644
index a6cf75b..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/dr3d/package-info.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Kentarou FUKUDA - initial API and implementation
- *******************************************************************************/
-
-/**
- * This package contains interfaces of ODF dr3d namespace.
- * Dr3d namespace contains elements and attributes that describe 3D graphics content.
- */
-package org.eclipse.actf.model.dom.odf.dr3d;
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/AreaCircleElement.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/AreaCircleElement.java
deleted file mode 100644
index 17fbedb..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/AreaCircleElement.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.draw;
-
-/**
- * Interface for &lt;draw:area-circle&gt; element.
- */
-public interface AreaCircleElement extends ImageMapAreaElement {
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/AreaPolygonElement.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/AreaPolygonElement.java
deleted file mode 100644
index 250bff0..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/AreaPolygonElement.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.draw;
-
-/**
- * Interface for &lt;draw:area-polygon&gt; element.
- */
-public interface AreaPolygonElement extends ImageMapAreaElement {
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/AreaRectangleElement.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/AreaRectangleElement.java
deleted file mode 100644
index b53ff05..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/AreaRectangleElement.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.draw;
-
-/**
- * Interface for &lt;draw:area-rectangle&gt; element.
- */
-public interface AreaRectangleElement extends ImageMapAreaElement {
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/CaptionElement.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/CaptionElement.java
deleted file mode 100644
index 36be4b0..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/CaptionElement.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.draw;
-
-import org.eclipse.actf.model.dom.odf.base.DrawingObjectElement;
-
-/**
- * Interface for &lt;draw:caption&gt; element.
- */
-public interface CaptionElement extends DrawingObjectElement {
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/CircleElement.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/CircleElement.java
deleted file mode 100644
index 3280afd..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/CircleElement.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.draw;
-
-import org.eclipse.actf.model.dom.odf.base.DrawingObjectElement;
-
-/**
- * Interface for &lt;draw:circle&gt; element.
- */
-public interface CircleElement extends DrawingObjectElement {
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/ConnectorElement.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/ConnectorElement.java
deleted file mode 100644
index ec71592..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/ConnectorElement.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.draw;
-
-import org.eclipse.actf.model.dom.odf.base.DrawingObjectElement;
-
-/**
- * Interface for &lt;draw:connector&gt; element.
- */
-public interface ConnectorElement extends DrawingObjectElement {
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/ControlElement.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/ControlElement.java
deleted file mode 100644
index af4da2c..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/ControlElement.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.draw;
-
-import org.eclipse.actf.model.dom.odf.base.DrawingObjectElement;
-import org.eclipse.actf.model.dom.odf.form.FixedTextElement;
-import org.eclipse.actf.model.dom.odf.form.FormControlElement;
-
-/**
- * Interface for &lt;draw:control&gt; element.
- */
-public interface ControlElement extends DrawingObjectElement {
-	/**
-	 * Return draw:control attribute
-	 * 
-	 * @return String
-	 */	
-	public String getAttrDrawControl();
-
-	/**
-	 * Return form control element specified by draw:control attribute
-	 * 
-	 * @return FormControlElement
-	 */	
-	public FormControlElement getFormControlElement();
-
-	/**
-	 * Return &lt;form:fixed-text&gt; element bound as label by form:for attribute
-	 * 
-	 * @return FixedTextElement
-	 */	
-	public FixedTextElement getFormLabelFixedTextElement();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/CustomShapeElement.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/CustomShapeElement.java
deleted file mode 100644
index d573799..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/CustomShapeElement.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.draw;
-
-import org.eclipse.actf.model.dom.odf.base.DrawingObjectElement;
-
-/**
- * Interface for &lt;draw:custom-shape&gt; element.
- */
-public interface CustomShapeElement extends DrawingObjectElement {
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/DrawConstants.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/DrawConstants.java
deleted file mode 100644
index 93c73e5..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/DrawConstants.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.draw;
-
-/**
- * DrawConstants defines the constant values used by drawing namespace of ODF DOM API
- */
-@SuppressWarnings("nls")
-public final class DrawConstants {
-	static public final String DRAW_NAMESPACE_URI = "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0";
-
-	static public final String ELEMENT_PAGE = "page";
-
-	static public final String ELEMENT_FRAME = "frame";
-
-	static public final String ELEMENT_OBJECT = "object";
-
-	static public final String ELEMENT_OBJECT_OLE = "object-ole";
-
-	static public final String ELEMENT_IMAGE = "image";
-
-	static public final String ELEMENT_GRADIENT = "gradient";
-
-	static public final String ELEMENT_HATCH = "hatch";
-
-	static public final String ELEMENT_FILL_IMAGE = "fill-image";
-
-	static public final String ELEMENT_OPACITY = "opacity";
-
-	static public final String ELEMENT_STROKE_DASH = "stroke-dash";
-
-	static public final String ELEMENT_IMAGE_MAP = "image-map";
-
-	static public final String ELEMENT_AREA_CIRCLE = "area-circle";
-
-	static public final String ELEMENT_AREA_POLYGON = "area-polygon";
-
-	static public final String ELEMENT_AREA_RECTANGLE = "area-rectangle";
-
-	static public final String ELEMENT_RECT = "rect";
-
-	static public final String ELEMENT_LINE = "line";
-
-	static public final String ELEMENT_POLYLINE = "polyline";
-
-	static public final String ELEMENT_POLYGON = "polygon";
-
-	static public final String ELEMENT_REGULAR_POLYGON = "regular-polygon";
-
-	static public final String ELEMENT_PATH = "path";
-
-	static public final String ELEMENT_CIRCLE = "circle";
-
-	static public final String ELEMENT_ELLIPSE = "ellipse";
-
-	static public final String ELEMENT_G = "g";
-
-	static public final String ELEMENT_PAGE_THUMBNAIL = "page-thumbnail";
-
-	static public final String ELEMENT_MEASURE = "measure";
-
-	static public final String ELEMENT_CAPTION = "caption";
-
-	static public final String ELEMENT_CONNECTOR = "connector";
-
-	static public final String ELEMENT_CONTROL = "control";
-
-	static public final String ELEMENT_CUSTOM_SHAPE = "custom-shape";
-
-	static public final String ELEMENT_TEXT_BOX = "text-box";
-
-	static public final String ATTR_Z_INDEX = "z-index";
-
-	static public final String ATTR_NOTIFY_ON_UPDATE_OF_RANGES = "notify-on-update-of-ranges";
-
-	static public final String ATTR_STROKE = "stroke";
-
-	static public final String ATTR_STROKE_DASH = "stroke-dash";
-
-	static public final String ATTR_MARKER_START_WIDTH = "marker-start-width";
-
-	static public final String ATTR_MARKER_END_WIDTH = "marker-end-width";
-
-	static public final String ATTR_OPACITY = "opacity";
-
-	static public final String ATTR_OPACITY_NAME = "opacity-name";
-
-	static public final String ATTR_FILL = "fill";
-
-	static public final String ATTR_FILL_COLOR = "fill-color";
-
-	static public final String ATTR_FILL_GRADIENT_NAME = "fill-gradient-name";
-
-	static public final String ATTR_GRADIENT_STEP_COUNT = "gradient-step-count";
-
-	static public final String ATTR_FILL_IMAGE_NAME = "fill-image-name";
-
-	static public final String ATTR_FILL_IMAGE_WIDTH = "fill-image-width";
-
-	static public final String ATTR_FILL_IMAGE_HEIGHT = "fill-image-height";
-
-	static public final String ATTR_FILL_IMAGE_REF_POINT_X = "fill-image-ref-point-x";
-
-	static public final String ATTR_FILL_IMAGE_REF_POINT_Y = "fill-image-ref-point-y";
-
-	static public final String ATTR_FILL_IMAGE_REF_POINT = "fill-image-ref-point";
-
-	static public final String ATTR_TILE_REPEAT_OFFSET = "tile-repeat-offset";
-
-	static public final String ATTR_NAME = "name";
-
-	static public final String ATTR_ID = "id";
-
-	static public final String ATTR_DISPLAY_NAME = "display-name";
-
-	static public final String ATTR_STYLE = "style";
-
-	static public final String ATTR_STYLE_NAME = "style-name";
-
-	static public final String ATTR_MASTER_PAGE_NAME = "master-page-name";
-
-	static public final String ATTR_START_COLOR = "start-color";
-
-	static public final String ATTR_END_COLOR = "end-color";
-
-	static public final String ATTR_START_INTENSITY = "start-intensity";
-
-	static public final String ATTR_END_INTENSITY = "end-intensity";
-
-	static public final String ATTR_ANGLE = "angle";
-
-	static public final String ATTR_BORDER = "border";
-
-	static public final String ATTR_COLOR = "color";
-
-	static public final String ATTR_DISTANCE = "distance";
-
-	static public final String ATTR_ROTATION = "rotation";
-
-	static public final String ATTR_START = "start";
-
-	static public final String ATTR_END = "end";
-
-	static public final String ATTR_DOTS1 = "dots1";
-
-	static public final String ATTR_DOTS1_LENGTH = "dots1-length";
-
-	static public final String ATTR_DOTS2 = "dots2";
-
-	static public final String ATTR_DOTS2_LENGTH = "dots2-length";
-
-	static public final String ATTR_CX = "cx";
-
-	static public final String ATTR_CY = "cy";
-
-	static public final String ATTR_BACKGROUND_SIZE = "background-size";
-
-	static public final String ATTR_CONTROL = "control";
-
-	static public final String ATTR_CAPTION_ID = "caption-id";
-
-	static public final String ATTR_NAV_ORDER = "nav-order";
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/EllipseElement.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/EllipseElement.java
deleted file mode 100644
index 36d8ec8..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/EllipseElement.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.draw;
-
-import org.eclipse.actf.model.dom.odf.base.DrawingObjectElement;
-
-/**
- * Interface for &lt;draw:ellipse&gt; element.
- */
-public interface EllipseElement extends DrawingObjectElement {
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/FillImageElement.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/FillImageElement.java
deleted file mode 100644
index 1271778..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/FillImageElement.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.draw;
-
-import org.eclipse.actf.model.dom.odf.base.ODFElement;
-
-/**
- * Interface for &lt;draw:fill-image&gt; element.
- */
-public interface FillImageElement extends ODFElement {
-	/**
-	 * Return draw:name attribute
-	 * 
-	 * @return String
-	 */		
-	public String getAttrDrawName();
-
-	/**
-	 * Return xlink:href attribute
-	 * 
-	 * @return String
-	 */		
-	public String getAttrXLinkHref();
-
-	/**
-	 * Return xlink:type attribute
-	 * 
-	 * @return String
-	 */	
-	public String getAttrXLinkType();
-
-	/**
-	 * Return xlink:show attribute
-	 * 
-	 * @return String
-	 */	
-	public String getAttrXLinkShow();
-
-	/**
-	 * Return xlink:actuate attribute
-	 * 
-	 * @return String
-	 */	
-	public String getAttrXLinkActuate();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/FrameElement.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/FrameElement.java
deleted file mode 100644
index ceffa99..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/FrameElement.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.draw;
-
-import java.util.Iterator;
-
-import org.eclipse.actf.model.dom.odf.base.DrawingObjectElement;
-import org.eclipse.actf.model.dom.odf.base.ODFElement;
-
-/**
- * Interface for &lt;draw:frame&gt; element.
- */
-public interface FrameElement extends DrawingObjectElement {
-	/**
-	 * Return table:end-cell-address attribute
-	 * 
-	 * @return String
-	 */
-	public String getAttrTableEndCellAddress();
-
-	/**
-	 * Return table:end-x attribute
-	 * 
-	 * @return String
-	 */
-	public String getAttrTableEndX();
-
-	/**
-	 * Return table:end-y attribute
-	 * 
-	 * @return String
-	 */
-	public String getAttrTableEndY();
-
-	/**
-	 * Return draw:z-index attribute
-	 * 
-	 * @return int
-	 */
-	public int getAttrDrawZIndex();
-
-	/**
-	 * Return svg:width attribute
-	 * 
-	 * @return String
-	 */
-	public String getAttrSvgWidth();
-
-	/**
-	 * Return svg:height attribute
-	 * 
-	 * @return String
-	 */
-	public String getAttrSvgHeight();
-
-	/**
-	 * Return svg:x attribute
-	 * 
-	 * @return String
-	 */
-	public String getAttrSvgX();
-
-	/**
-	 * Return svg:y attribute
-	 * 
-	 * @return String
-	 */
-	public String getAttrSvgY();
-
-	/**
-	 * Return number of child elements
-	 * 
-	 * @return long
-	 */
-	public long getContentSize();
-
-	/**
-	 * Return iterator for child elements
-	 * 
-	 * @return Iterator&lt;ODFElement&gt;
-	 */
-	public Iterator<ODFElement> getChildIterator();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/GElement.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/GElement.java
deleted file mode 100644
index 8c81798..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/GElement.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.draw;
-
-import org.eclipse.actf.model.dom.odf.base.DrawingObjectElement;
-
-/**
- * Interface for &lt;draw:g&gt; element.
- */
-public interface GElement extends DrawingObjectElement {
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/GradientElement.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/GradientElement.java
deleted file mode 100644
index bfbc5de..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/GradientElement.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.draw;
-
-import org.eclipse.actf.model.dom.odf.base.ODFElement;
-
-/**
- * Interface for &lt;draw:gradient&gt; element.
- */
-public interface GradientElement extends ODFElement {
-	/**
-	 * Return draw:name attribute
-	 * 
-	 * @return String
-	 */	
-	public String getAttrDrawName();
-
-	/**
-	 * Return draw:display-name attribute
-	 * 
-	 * @return String
-	 */	
-	public String getAttrDrawDisplayName();
-
-	/**
-	 * Return draw:style attribute
-	 * 
-	 * @return String
-	 */	
-	public String getAttrDrawStyle();
-
-	/**
-	 * Return draw:start-color attribute
-	 * 
-	 * @return String
-	 */	
-	public String getAttrDrawStartColor();
-
-	/**
-	 * Return draw:end-color attribute
-	 * 
-	 * @return String
-	 */	
-	public String getAttrDrawEndColor();
-
-	/**
-	 * Return draw:cx attribute
-	 * 
-	 * @return String
-	 */	
-	public String getAttrDrawCx();
-
-	/**
-	 * Return draw:cy attribute
-	 * 
-	 * @return String
-	 */	
-	public String getAttrDrawCy();
-
-	/**
-	 * Return draw:start-intensity attribute
-	 * 
-	 * @return String
-	 */	
-	public String getAttrDrawStartIntensity();
-
-	/**
-	 * Return draw:end-intensity attribute
-	 * 
-	 * @return String
-	 */	
-	public String getAttrDrawEndIntensity();
-
-	/**
-	 * Return draw:angle attribute
-	 * 
-	 * @return int
-	 */	
-	public int getAttrDrawAngle();
-
-	/**
-	 * Return draw:border attribute
-	 * 
-	 * @return String
-	 */	
-	public String getAttrDrawBorder();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/HatchElement.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/HatchElement.java
deleted file mode 100644
index 40eebf5..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/HatchElement.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.draw;
-
-import org.eclipse.actf.model.dom.odf.base.ODFElement;
-
-/**
- * Interface for &lt;draw:hatch&gt; element.
- */
-public interface HatchElement extends ODFElement {
-	/**
-	 * Return draw:name attribute
-	 * 
-	 * @return String
-	 */	
-	public String getAttrDrawName();
-
-	/**
-	 * Return draw:display-name attribute
-	 * 
-	 * @return String
-	 */	
-	public String getAttrDrawDisplayName();
-
-	/**
-	 * Return draw:style attribute
-	 * 
-	 * @return String
-	 */	
-	public String getAttrDrawStyle();
-
-	/**
-	 * Return draw:color attribute
-	 * 
-	 * @return String
-	 */	
-	public String getAttrDrawColor();
-
-	/**
-	 * Return draw:distance attribute
-	 * 
-	 * @return String
-	 */	
-	public String getAttrDrawDistance();
-	
-	/**
-	 * Return draw:rotation attribute
-	 * 
-	 * @return String
-	 */	
-	public String getAttrDrawRotation();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/ImageElement.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/ImageElement.java
deleted file mode 100644
index b653ef0..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/ImageElement.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.draw;
-
-import org.eclipse.actf.model.dom.odf.base.EmbedDrawingObjectElement;
-
-/**
- * Interface for &lt;draw:image&gt; element.
- */
-public interface ImageElement extends EmbedDrawingObjectElement {
-	/**
-	 * Return xlink:href attribute
-	 * 
-	 * @return xlink:href attribute.
-	 */		
-	String getAttrXlinkHref();
-
-	/**
-	 * Return xlink:type attribute
-	 * 
-	 * @return xlink:type attribute.
-	 */		
-	String getAttrXlinkType();
-
-	/**
-	 * Return xlink:show attribute
-	 * 
-	 * @return xlink:show attribute.
-	 */		
-	String getAttrXlinkShow();
-
-	/**
-	 * Return xlink:actuate attribute
-	 * 
-	 * @return xlink:actuate attribute.
-	 */		
-	String getAttrXlinkActuate();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/ImageMapAreaElement.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/ImageMapAreaElement.java
deleted file mode 100644
index 6064971..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/ImageMapAreaElement.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.draw;
-
-import org.eclipse.actf.model.dom.odf.base.DrawingObjectElement;
-
-/**
- * ODF elements that has &lt;draw:image-map&gt; as parent should implement this interface.
- */
-public interface ImageMapAreaElement extends DrawingObjectElement {
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/ImageMapElement.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/ImageMapElement.java
deleted file mode 100644
index f901bad..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/ImageMapElement.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.draw;
-
-import org.eclipse.actf.model.dom.odf.base.EmbedDrawingObjectElement;
-import org.w3c.dom.NodeList;
-
-/**
- * Interface for &lt;draw:image-map&gt; element.
- */
-public interface ImageMapElement extends EmbedDrawingObjectElement {
-	/**
-	 * Return &lt;draw:image&gt; element 
-	 * 
-	 * @return ImageElement
-	 */	
-	public ImageElement getImageElements();
-
-	/**
-	 * Return node list of image map area elements
-	 * 
-	 * @return NodeList
-	 */	
-	public NodeList getAreaElements();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/LineElement.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/LineElement.java
deleted file mode 100644
index 3149489..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/LineElement.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.draw;
-
-import org.eclipse.actf.model.dom.odf.base.DrawingObjectElement;
-
-/**
- * Interface for &lt;draw:line&gt; element.
- */
-public interface LineElement extends DrawingObjectElement {
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/MeasureElement.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/MeasureElement.java
deleted file mode 100644
index 4e212ae..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/MeasureElement.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.draw;
-
-import org.eclipse.actf.model.dom.odf.base.DrawingObjectElement;
-
-/**
- * Interface for &lt;draw:measure&gt; element.
- */
-public interface MeasureElement extends DrawingObjectElement {
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/ObjectElement.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/ObjectElement.java
deleted file mode 100644
index b1d4892..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/ObjectElement.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.draw;
-
-import org.eclipse.actf.model.dom.odf.base.EmbedDrawingObjectElement;
-
-/**
- * Interface for &lt;draw:object&gt; element.
- */
-public interface ObjectElement extends EmbedDrawingObjectElement {
-	/**
-	 * Return draw:notify-on-update-of-ranges attribute
-	 * 
-	 * @return String
-	 */		
-	public String getAttrDrawNotifyOnUpdateOfRanges();
-
-	/**
-	 * Set xlink:href attribute
-	 * 
-	 * @param href
-	 *            xlink:href attribute
-	 */	
-	public void setAttrXlinkHref(String href);
-
-	/**
-	 * Return xlink:href attribute
-	 * 
-	 * @return String
-	 */	
-	public String getAttrXlinkHref();
-
-	/**
-	 * Return xlink:type attribute
-	 * 
-	 * @return String
-	 */	
-	public String getAttrXlinkType();
-
-	/**
-	 * Return xlink:show attribute
-	 * 
-	 * @return String
-	 */	
-	public String getAttrXlinkShow();
-
-	/**
-	 * Return xlink:actuate attribute
-	 * 
-	 * @return String
-	 */	
-	public String getAttrXlinkActuate();
-
-	/**
-	 * Return true if this object is embedded spreadsheet in presentation document
-	 * 
-	 * @return boolean
-	 */	
-	public boolean isPresentationTable();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/ObjectOleElement.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/ObjectOleElement.java
deleted file mode 100644
index fe84713..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/ObjectOleElement.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.draw;
-
-import org.eclipse.actf.model.dom.odf.base.EmbedDrawingObjectElement;
-
-/**
- * Interface for &lt;draw:object-ole&gt; element.
- */
-public interface ObjectOleElement extends EmbedDrawingObjectElement {
-}
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/OpacityElement.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/OpacityElement.java
deleted file mode 100644
index 1f0d943..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/OpacityElement.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.draw;
-
-import org.eclipse.actf.model.dom.odf.base.ODFElement;
-
-/**
- * Interface for &lt;draw:opacity&gt; element.
- */
-public interface OpacityElement extends ODFElement {
-	/**
-	 * Return draw:name attribute
-	 * 
-	 * @return String
-	 */		
-	public String getAttrDrawName();
-
-	/**
-	 * Return draw:display-name attribute
-	 * 
-	 * @return String
-	 */	
-	public String getAttrDrawDisplayName();
-
-	/**
-	 * Return draw:style attribute
-	 * 
-	 * @return String
-	 */	
-	public String getAttrDrawStyle();
-
-	/**
-	 * Return draw:start attribute
-	 * 
-	 * @return String
-	 */	
-	public String getAttrDrawStart();
-
-	/**
-	 * Return draw:end attribute
-	 * 
-	 * @return String
-	 */	
-	public String getAttrDrawEnd();
-
-	/**
-	 * Return draw:angle attribute
-	 * 
-	 * @return int
-	 */	
-	public int getAttrDrawAngle();
-
-	/**
-	 * Return draw:border attribute
-	 * 
-	 * @return String
-	 */	
-	public String getAttrDrawBorder();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/PageElement.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/PageElement.java
deleted file mode 100644
index 8ff08ce..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/PageElement.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.draw;
-
-import java.util.List;
-
-import org.eclipse.actf.model.dom.odf.base.ODFElement;
-import org.eclipse.actf.model.dom.odf.presentation.NotesElement;
-import org.w3c.dom.NodeList;
-
-/**
- * Interface for &lt;draw:page&gt; element.
- */
-public interface PageElement extends ODFElement {
-	/**
-	 * Create new object in page
-	 * 
-	 * @param x
-	 *            x position of new object
-	 * @param y
-	 *            y position of new object
-	 * @param width
-	 *            width of new object
-	 * @param height
-	 *            height of new object
-	 * @return ODFElement
-	 */		
-	public ODFElement createObject(long x, long y, long width, long height);
-
-	/**
-	 * Return draw:name attribute
-	 * 
-	 * @return String
-	 */
-	public String getAttrDrawName();
-
-	/**
-	 * Return draw:style-name attribute
-	 * 
-	 * @return String
-	 */		
-	public String getAttrDrawStyleName();
-
-	/**
-	 * Return draw:master-page-name attribute
-	 * 
-	 * @return String
-	 */		
-	public String getAttrDrawMasterPageName();
-
-	/**
-	 * Return draw:nav-order attribute
-	 * 
-	 * @return String
-	 */		
-	public String getAttrDrawNavOrder();
-
-	/**
-	 * Return page index
-	 * 
-	 * @return int
-	 */		
-	public int getPageIndex();
-
-	/**
-	 * Return child ODF nodes by navigation order
-	 * 
-	 * @return List&lt;ODFElement&gt;
-	 */		
-	public List<ODFElement> getChildNodesInNavOrder();
-
-	/**
-	 * Return graphic elements in page
-	 * 
-	 * @return NodeList
-	 */		
-	public NodeList getDrawingObjectElements();
-
-	/**
-	 * Return &lt;presentation:notes&gt; element
-	 * 
-	 * @return NotesElement
-	 */		
-	public NotesElement getPresentationNotesElement();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/PageThumbnailElement.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/PageThumbnailElement.java
deleted file mode 100644
index 60a42f6..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/PageThumbnailElement.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.draw;
-
-import org.eclipse.actf.model.dom.odf.base.DrawingObjectElement;
-
-/**
- * Interface for &lt;draw:page-thumbnail&gt; element.
- */
-public interface PageThumbnailElement extends DrawingObjectElement {
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/PathElement.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/PathElement.java
deleted file mode 100644
index d8b24ef..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/PathElement.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.draw;
-
-import org.eclipse.actf.model.dom.odf.base.DrawingObjectElement;
-
-/**
- * Interface for &lt;draw:path&gt; element.
- */
-public interface PathElement extends DrawingObjectElement {
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/PolygonElement.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/PolygonElement.java
deleted file mode 100644
index 4b43dc9..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/PolygonElement.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.draw;
-
-import org.eclipse.actf.model.dom.odf.base.DrawingObjectElement;
-
-/**
- * Interface for &lt;draw:polygon&gt; element.
- */
-public interface PolygonElement extends DrawingObjectElement {
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/PolylineElement.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/PolylineElement.java
deleted file mode 100644
index 2f1af19..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/PolylineElement.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.draw;
-
-import org.eclipse.actf.model.dom.odf.base.DrawingObjectElement;
-
-/**
- * Interface for &lt;draw:polyline&gt; element.
- */
-public interface PolylineElement extends DrawingObjectElement {
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/RectElement.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/RectElement.java
deleted file mode 100644
index 2aa6ffa..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/RectElement.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.draw;
-
-import org.eclipse.actf.model.dom.odf.base.DrawingObjectElement;
-
-/**
- * Interface for &lt;draw:rect&gt; element.
- */
-public interface RectElement extends DrawingObjectElement {
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/RegularPolygonElement.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/RegularPolygonElement.java
deleted file mode 100644
index 3d891cc..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/RegularPolygonElement.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.draw;
-
-import org.eclipse.actf.model.dom.odf.base.DrawingObjectElement;
-
-/**
- * Interface for &lt;draw:regular-polygon&gt; element.
- */
-public interface RegularPolygonElement extends DrawingObjectElement {
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/StrokeDashElement.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/StrokeDashElement.java
deleted file mode 100644
index 0bc9450..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/StrokeDashElement.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.draw;
-
-import org.eclipse.actf.model.dom.odf.base.ODFElement;
-
-/**
- * Interface for &lt;draw:stroke-dash&gt; element.
- */
-public interface StrokeDashElement extends ODFElement {
-	/**
-	 * Return draw:name attribute
-	 * 
-	 * @return String
-	 */	
-	public String getAttrDrawName();
-
-	/**
-	 * Return draw:display-name attribute
-	 * 
-	 * @return String
-	 */	
-	public String getAttrDrawDisplayName();
-
-	/**
-	 * Return draw:style attribute
-	 * 
-	 * @return String
-	 */
-	public String getAttrDrawStyle();
-
-	/**
-	 * Return draw:dots1 attribute
-	 * 
-	 * @return int
-	 */
-	public int getAttrDrawDots1();
-
-	/**
-	 * Return draw:dots1-length attribute
-	 * 
-	 * @return String
-	 */
-	public String getAttrDrawDots1Length();
-
-	/**
-	 * Return draw:dots2 attribute
-	 * 
-	 * @return int
-	 */
-	public int getAttrDrawDots2();
-
-	/**
-	 * Return draw:dots2-length attribute
-	 * 
-	 * @return String
-	 */
-	public String getAttrDrawDots2Length();
-
-	/**
-	 * Return draw:distance attribute
-	 * 
-	 * @return String
-	 */
-	public String getAttrDrawDistance();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/TextBoxElement.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/TextBoxElement.java
deleted file mode 100644
index 560c11e..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/TextBoxElement.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.draw;
-
-import org.eclipse.actf.model.dom.odf.base.EmbedDrawingObjectElement;
-
-/**
- * Interface for &lt;draw:text-box&gt; element.
- */
-public interface TextBoxElement extends EmbedDrawingObjectElement {
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/impl/AreaCircleElementImpl.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/impl/AreaCircleElementImpl.java
deleted file mode 100644
index 6d00add..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/impl/AreaCircleElementImpl.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.draw.impl;
-
-import org.eclipse.actf.model.dom.odf.base.ODFDocument;
-import org.eclipse.actf.model.dom.odf.draw.AreaCircleElement;
-import org.w3c.dom.Element;
-
-
-class AreaCircleElementImpl extends ImageMapAreaElementImpl implements
-		AreaCircleElement {
-	private static final long serialVersionUID = 4963823752873198010L;
-
-	protected AreaCircleElementImpl(ODFDocument odfDoc, Element element) {
-		super(odfDoc, element);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/impl/AreaPolygonElementImpl.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/impl/AreaPolygonElementImpl.java
deleted file mode 100644
index 9bb89e3..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/impl/AreaPolygonElementImpl.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.draw.impl;
-
-import org.eclipse.actf.model.dom.odf.base.ODFDocument;
-import org.eclipse.actf.model.dom.odf.draw.AreaPolygonElement;
-import org.w3c.dom.Element;
-
-
-class AreaPolygonElementImpl extends ImageMapAreaElementImpl implements
-		AreaPolygonElement {
-	private static final long serialVersionUID = -7787852406360330911L;
-
-	protected AreaPolygonElementImpl(ODFDocument odfDoc, Element element) {
-		super(odfDoc, element);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/impl/AreaRectangleElementImpl.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/impl/AreaRectangleElementImpl.java
deleted file mode 100644
index fb9a47b..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/impl/AreaRectangleElementImpl.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.draw.impl;
-
-import org.eclipse.actf.model.dom.odf.base.ODFDocument;
-import org.eclipse.actf.model.dom.odf.draw.AreaRectangleElement;
-import org.w3c.dom.Element;
-
-
-class AreaRectangleElementImpl extends ImageMapAreaElementImpl implements
-		AreaRectangleElement {
-	private static final long serialVersionUID = 2649141873537166703L;
-
-	protected AreaRectangleElementImpl(ODFDocument odfDoc, Element element) {
-		super(odfDoc, element);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/impl/CaptionElementImpl.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/impl/CaptionElementImpl.java
deleted file mode 100644
index 6d62c67..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/impl/CaptionElementImpl.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.draw.impl;
-
-import org.eclipse.actf.model.dom.odf.base.ODFDocument;
-import org.eclipse.actf.model.dom.odf.base.impl.DrawingObjectElementImpl;
-import org.eclipse.actf.model.dom.odf.draw.CaptionElement;
-import org.w3c.dom.Element;
-
-
-class CaptionElementImpl extends DrawingObjectElementImpl implements
-		CaptionElement {
-	private static final long serialVersionUID = 5273342296877500912L;
-
-	protected CaptionElementImpl(ODFDocument odfDoc, Element element) {
-		super(odfDoc, element);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/impl/CircleElementImpl.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/impl/CircleElementImpl.java
deleted file mode 100644
index 24b013b..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/impl/CircleElementImpl.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.draw.impl;
-
-import org.eclipse.actf.model.dom.odf.base.ODFDocument;
-import org.eclipse.actf.model.dom.odf.base.impl.DrawingObjectElementImpl;
-import org.eclipse.actf.model.dom.odf.draw.CircleElement;
-import org.w3c.dom.Element;
-
-
-class CircleElementImpl extends DrawingObjectElementImpl implements
-		CircleElement {
-	private static final long serialVersionUID = 7244652338038985691L;
-
-	protected CircleElementImpl(ODFDocument odfDoc, Element element) {
-		super(odfDoc, element);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/impl/ConnectorElementImpl.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/impl/ConnectorElementImpl.java
deleted file mode 100644
index df4c961..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/impl/ConnectorElementImpl.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.draw.impl;
-
-import org.eclipse.actf.model.dom.odf.base.ODFDocument;
-import org.eclipse.actf.model.dom.odf.base.impl.DrawingObjectElementImpl;
-import org.eclipse.actf.model.dom.odf.draw.ConnectorElement;
-import org.w3c.dom.Element;
-
-
-class ConnectorElementImpl extends DrawingObjectElementImpl implements
-		ConnectorElement {
-	private static final long serialVersionUID = -336123720038047678L;
-
-	protected ConnectorElementImpl(ODFDocument odfDoc, Element element) {
-		super(odfDoc, element);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/impl/ControlElementImpl.java b/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/impl/ControlElementImpl.java
deleted file mode 100644
index 41e0824..0000000
--- a/plugins/org.eclipse.actf.model.dom.odf/src/org/eclipse/actf/model/dom/odf/draw/impl/ControlElementImpl.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Tatsuya ISHIHARA - initial API and implementation
- *******************************************************************************/
-package org.eclipse.actf.model.dom.odf.draw.impl;
-
-import org.eclipse.actf.model.dom.odf.ODFException;
-import org.eclipse.actf.model.dom.odf.base.ODFDocument;
-import org.eclipse.actf.model.dom.odf.base.impl.DrawingObjectElementImpl;
-import org.eclipse.actf.model.dom.odf