[232278] merge actf,common into actf.core/move ui utils into actf.ui
diff --git a/features/org.eclipse.actf.ai-feature/feature.xml b/features/org.eclipse.actf.ai-feature/feature.xml
index 48cc729..a73d3b6 100644
--- a/features/org.eclipse.actf.ai-feature/feature.xml
+++ b/features/org.eclipse.actf.ai-feature/feature.xml
@@ -136,7 +136,7 @@
unpack="false"/>
<plugin
- id="org.eclipse.actf.common"
+ id="org.eclipse.actf.core"
download-size="0"
install-size="0"
version="0.0.0"/>
diff --git a/plugins/org.eclipse.actf.ai.audio.description/META-INF/MANIFEST.MF b/plugins/org.eclipse.actf.ai.audio.description/META-INF/MANIFEST.MF
index 4476431..1212886 100644
--- a/plugins/org.eclipse.actf.ai.audio.description/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.actf.ai.audio.description/META-INF/MANIFEST.MF
@@ -12,7 +12,8 @@
org.eclipse.actf.ai.navigator,
org.eclipse.actf.ai.voice,
org.eclipse.actf.ai.xmlstore,
- org.eclipse.actf.common,
+ org.eclipse.actf.core,
+ org.eclipse.actf.ui,
org.eclipse.actf.model.ui
Eclipse-LazyStart: true
Export-Package: org.eclipse.actf.ai.audio.description
diff --git a/plugins/org.eclipse.actf.ai.fennec/META-INF/MANIFEST.MF b/plugins/org.eclipse.actf.ai.fennec/META-INF/MANIFEST.MF
index 50f97d7..d64c7bb 100644
--- a/plugins/org.eclipse.actf.ai.fennec/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.actf.ai.fennec/META-INF/MANIFEST.MF
@@ -7,12 +7,13 @@
Bundle-Vendor: Eclipse.org
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.actf.util.vocab,
- org.eclipse.actf.common,
+ org.eclipse.actf.core,
org.eclipse.actf.model.ui,
org.eclipse.actf.model.dom.dombycom,
org.eclipse.actf.ai.query,
org.eclipse.actf.ai.xmlstore,
- org.eclipse.swt
+ org.eclipse.swt,
+ org.eclipse.actf.ui
Eclipse-LazyStart: true
Export-Package: org.eclipse.actf.ai.fennec,
org.eclipse.actf.ai.fennec.treemanager
diff --git a/plugins/org.eclipse.actf.ai.fennec/src/org/eclipse/actf/ai/fennec/impl/TreeItemVideoControl.java b/plugins/org.eclipse.actf.ai.fennec/src/org/eclipse/actf/ai/fennec/impl/TreeItemVideoControl.java
index 0cfd7a9..69763cc 100644
--- a/plugins/org.eclipse.actf.ai.fennec/src/org/eclipse/actf/ai/fennec/impl/TreeItemVideoControl.java
+++ b/plugins/org.eclipse.actf.ai.fennec/src/org/eclipse/actf/ai/fennec/impl/TreeItemVideoControl.java
@@ -20,7 +20,7 @@
import org.eclipse.actf.model.dom.dombycom.AnalyzedResult;
import org.eclipse.actf.model.dom.dombycom.INodeEx;
import org.eclipse.actf.model.dom.dombycom.INodeExVideo;
-import org.eclipse.actf.util.timer.WeakSyncTimer;
+import org.eclipse.actf.ui.util.timer.WeakSyncTimer;
import org.eclipse.actf.util.vocab.IProposition;
import org.eclipse.actf.util.vocab.Vocabulary;
diff --git a/plugins/org.eclipse.actf.ai.fennec/src/org/eclipse/actf/ai/fennec/treemanager/IMediaSyncEventListener.java b/plugins/org.eclipse.actf.ai.fennec/src/org/eclipse/actf/ai/fennec/treemanager/IMediaSyncEventListener.java
index 700e560..c201113 100644
--- a/plugins/org.eclipse.actf.ai.fennec/src/org/eclipse/actf/ai/fennec/treemanager/IMediaSyncEventListener.java
+++ b/plugins/org.eclipse.actf.ai.fennec/src/org/eclipse/actf/ai/fennec/treemanager/IMediaSyncEventListener.java
@@ -11,7 +11,7 @@
package org.eclipse.actf.ai.fennec.treemanager;
-import org.eclipse.actf.util.timer.SyncEventListener;
+import org.eclipse.actf.ui.util.timer.SyncEventListener;
/**
* IMediaSyncEventListener is the place holder of the implementation of
diff --git a/plugins/org.eclipse.actf.ai.navigator/META-INF/MANIFEST.MF b/plugins/org.eclipse.actf.ai.navigator/META-INF/MANIFEST.MF
index 39f315a..4ea6235 100644
--- a/plugins/org.eclipse.actf.ai.navigator/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.actf.ai.navigator/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui,
- org.eclipse.actf.common,
+ org.eclipse.actf.core,
org.eclipse.actf.ai.fennec,
org.eclipse.actf.util.vocab,
org.eclipse.actf.model.ui,
diff --git a/plugins/org.eclipse.actf.ai.navigator/src/org/eclipse/actf/ai/navigator/broker/RequestBroker.java b/plugins/org.eclipse.actf.ai.navigator/src/org/eclipse/actf/ai/navigator/broker/RequestBroker.java
index 7009c47..4d50d1f 100644
--- a/plugins/org.eclipse.actf.ai.navigator/src/org/eclipse/actf/ai/navigator/broker/RequestBroker.java
+++ b/plugins/org.eclipse.actf.ai.navigator/src/org/eclipse/actf/ai/navigator/broker/RequestBroker.java
@@ -16,7 +16,7 @@
import org.eclipse.actf.ai.navigator.impl.NavigatorImpl;
import org.eclipse.actf.ai.navigator.impl.WebEventListener;
import org.eclipse.actf.model.ui.editor.browser.IWebBrowserACTF;
-import org.eclipse.actf.util.timer.Yield;
+import org.eclipse.actf.ui.util.timer.Yield;
public class RequestBroker {
diff --git a/plugins/org.eclipse.actf.ai.navigator/src/org/eclipse/actf/ai/navigator/impl/NavigatorImpl.java b/plugins/org.eclipse.actf.ai.navigator/src/org/eclipse/actf/ai/navigator/impl/NavigatorImpl.java
index b990a5a..424f642 100644
--- a/plugins/org.eclipse.actf.ai.navigator/src/org/eclipse/actf/ai/navigator/impl/NavigatorImpl.java
+++ b/plugins/org.eclipse.actf.ai.navigator/src/org/eclipse/actf/ai/navigator/impl/NavigatorImpl.java
@@ -46,9 +46,9 @@
import org.eclipse.actf.ai.voice.IVoiceEventListener;
import org.eclipse.actf.model.ui.IModelServiceHolder;
import org.eclipse.actf.model.ui.editor.browser.IWebBrowserACTF;
+import org.eclipse.actf.ui.util.BrowserLaunch;
import org.eclipse.actf.ui.util.PlatformUIUtil;
import org.eclipse.actf.util.ApplicationArgumentUtil;
-import org.eclipse.actf.util.BrowserLaunch;
import org.eclipse.actf.util.vocab.IProposition;
import org.eclipse.actf.util.vocab.Vocabulary;
import org.eclipse.jface.dialogs.InputDialog;
diff --git a/plugins/org.eclipse.actf.ai.query/META-INF/MANIFEST.MF b/plugins/org.eclipse.actf.ai.query/META-INF/MANIFEST.MF
index 6dba4c4..7f78806 100644
--- a/plugins/org.eclipse.actf.ai.query/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.actf.ai.query/META-INF/MANIFEST.MF
@@ -8,6 +8,6 @@
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.actf.model.dom.dombycom,
org.eclipse.actf.util.vocab,
- org.eclipse.actf.common
+ org.eclipse.actf.core
Eclipse-LazyStart: true
Export-Package: org.eclipse.actf.ai.query
diff --git a/plugins/org.eclipse.actf.ai.screenreader.jaws/META-INF/MANIFEST.MF b/plugins/org.eclipse.actf.ai.screenreader.jaws/META-INF/MANIFEST.MF
index f27c1d3..6cc9ed8 100644
--- a/plugins/org.eclipse.actf.ai.screenreader.jaws/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.actf.ai.screenreader.jaws/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@
Bundle-Vendor: Eclipse.org
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
- org.eclipse.actf.common,
+ org.eclipse.actf.core,
org.eclipse.actf.ai.navigator,
org.eclipse.actf.ai.voice,
org.eclipse.actf.model.ui
