Google Git
Sign in
eclipse/actf/org.eclipse.actf.examples/a3ce8de2da16b856a82e94993f77307a9d41aa40^!/.
commit
a3ce8de2da16b856a82e94993f77307a9d41aa40
[log]
author
kfukuda <kfukuda>
Thu Jun 07 19:35:14 2012 +0000
committer
kfukuda <kfukuda>
Thu Jun 07 19:35:14 2012 +0000
tree
b01e4c8cbb07daa2e09a17a288d9b652230f9fbf
parent
feafe12ac59307fe73ff7b40f29358d773103deb [diff]
[309606] Develop Script Editor (Format, etc.)

diff --git a/plugins/org.eclipse.actf.examples.scripteditor/src/org/eclipse/actf/ai/internal/ui/scripteditor/EditPanelTab.java b/plugins/org.eclipse.actf.examples.scripteditor/src/org/eclipse/actf/ai/internal/ui/scripteditor/EditPanelTab.java
index e1f696e..ae4a56c 100644
--- a/plugins/org.eclipse.actf.examples.scripteditor/src/org/eclipse/actf/ai/internal/ui/scripteditor/EditPanelTab.java
+++ b/plugins/org.eclipse.actf.examples.scripteditor/src/org/eclipse/actf/ai/internal/ui/scripteditor/EditPanelTab.java

@@ -1178,7 +1178,7 @@
 	 */
 	public void repaintTextEndTime() {
 		// PickUP current text
-		if(scaleVoiceSpeed.isDisposed()){
+		if (scaleVoiceSpeed.isDisposed()) {
 			return;
 		}
 		int extendSpeed = scaleVoiceSpeed.getSelection();

diff --git a/plugins/org.eclipse.actf.examples.scripteditor/src/org/eclipse/actf/ai/internal/ui/scripteditor/PreviewPanel.java b/plugins/org.eclipse.actf.examples.scripteditor/src/org/eclipse/actf/ai/internal/ui/scripteditor/PreviewPanel.java
index cdd3d84..1e85c8f 100644
--- a/plugins/org.eclipse.actf.examples.scripteditor/src/org/eclipse/actf/ai/internal/ui/scripteditor/PreviewPanel.java
+++ b/plugins/org.eclipse.actf.examples.scripteditor/src/org/eclipse/actf/ai/internal/ui/scripteditor/PreviewPanel.java

@@ -249,7 +249,7 @@
 	 */
 	public String getURLMovie() {
 		IModelService model = ModelServiceUtils.getActiveModelService();
-		if(model instanceof IWebBrowserACTF){
+		if (model instanceof IWebBrowserACTF) {
 			return model.getURL();
 		}
 		return "about:blank";
@@ -259,11 +259,11 @@
 	 * @category Setter Method
 	 * @purpose Set new URL to Text field
 	 */
-	public void setURLMovie(String newURL) {		
+	public void setURLMovie(String newURL) {
 		IModelService model = ModelServiceUtils.getActiveModelService();
-		if(model instanceof IWebBrowserACTF){
+		if (model instanceof IWebBrowserACTF) {
 			((IWebBrowserACTF) model).navigate(newURL);
-		}else{
+		} else {
 			ModelServiceUtils.launch(newURL, WebBrowserEditor.ID);
 		}
 	}
@@ -549,10 +549,10 @@
 
 		// reload media content
 		IModelService model = ModelServiceUtils.getActiveModelService();
-		if(model instanceof IWebBrowserACTF){
+		if (model instanceof IWebBrowserACTF) {
 			((IWebBrowserACTF) model).navigateRefresh();
 		}
-		
+
 		// Stop TTS engine
 		instParentView.reqStopVoicePlayer();
 

diff --git a/plugins/org.eclipse.actf.examples.scripteditor/src/org/eclipse/actf/ai/internal/ui/scripteditor/ScriptListTable.java b/plugins/org.eclipse.actf.examples.scripteditor/src/org/eclipse/actf/ai/internal/ui/scripteditor/ScriptListTable.java
index b0b640a..82b776d 100644
--- a/plugins/org.eclipse.actf.examples.scripteditor/src/org/eclipse/actf/ai/internal/ui/scripteditor/ScriptListTable.java
+++ b/plugins/org.eclipse.actf.examples.scripteditor/src/org/eclipse/actf/ai/internal/ui/scripteditor/ScriptListTable.java

@@ -81,11 +81,6 @@
 
 	}
 
-	/**
-	 * @category
-	 
-	 
-	 */
 	private void initTable() {
 
 		// Set Layout for ScriptList Table

diff --git a/plugins/org.eclipse.actf.examples.scripteditor/src/org/eclipse/actf/ai/internal/ui/scripteditor/WebBrowserEventListenerForPP.java b/plugins/org.eclipse.actf.examples.scripteditor/src/org/eclipse/actf/ai/internal/ui/scripteditor/WebBrowserEventListenerForPP.java
index c49ff07..b74251f 100644
--- a/plugins/org.eclipse.actf.examples.scripteditor/src/org/eclipse/actf/ai/internal/ui/scripteditor/WebBrowserEventListenerForPP.java
+++ b/plugins/org.eclipse.actf.examples.scripteditor/src/org/eclipse/actf/ai/internal/ui/scripteditor/WebBrowserEventListenerForPP.java

@@ -21,7 +21,7 @@
 	public void beforeNavigate(IWebBrowserACTF webBrowser, String url,
 			String targetFrameName, boolean isInNavigation) {
 
-		//System.out.println(isInNavigation +" : "+targetFrameName+" : "+url);
+		// System.out.println(isInNavigation +" : "+targetFrameName+" : "+url);
 		if (isInNavigation && url != null
 				&& (url.startsWith("http") || url.startsWith("file"))) {
 			FlashCacheUtil.clearCache(true, null);

diff --git a/plugins/org.eclipse.actf.examples.scripteditor/src/org/eclipse/actf/ai/scripteditor/data/XMLFileSaveUtil.java b/plugins/org.eclipse.actf.examples.scripteditor/src/org/eclipse/actf/ai/scripteditor/data/XMLFileSaveUtil.java
index 50503c9..39800aa 100644
--- a/plugins/org.eclipse.actf.examples.scripteditor/src/org/eclipse/actf/ai/scripteditor/data/XMLFileSaveUtil.java
+++ b/plugins/org.eclipse.actf.examples.scripteditor/src/org/eclipse/actf/ai/scripteditor/data/XMLFileSaveUtil.java

@@ -12,7 +12,6 @@
 
 import java.io.File;
 import java.io.FileOutputStream;
-import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 

diff --git a/plugins/org.eclipse.actf.examples.scripteditor/src/org/eclipse/actf/ai/scripteditor/util/ResourceUtil.java b/plugins/org.eclipse.actf.examples.scripteditor/src/org/eclipse/actf/ai/scripteditor/util/ResourceUtil.java
index 7f16787..86ca85d 100644
--- a/plugins/org.eclipse.actf.examples.scripteditor/src/org/eclipse/actf/ai/scripteditor/util/ResourceUtil.java
+++ b/plugins/org.eclipse.actf.examples.scripteditor/src/org/eclipse/actf/ai/scripteditor/util/ResourceUtil.java

@@ -44,9 +44,9 @@
 				"resources/css/vd-player-ie.css"), path + "vd-player-ie.css",
 				true);
 
-		FileUtils.copyFile(bundleBlind, new Path(
-				"resources/css/vd-player.css"), path + "vd-player.css",
-				true);
+		FileUtils.copyFile(bundleBlind,
+				new Path("resources/css/vd-player.css"),
+				path + "vd-player.css", true);
 
 	}
 }

diff --git a/plugins/org.eclipse.actf.examples.scripteditor/src/org/eclipse/actf/ai/scripteditor/util/TTMLUtil.java b/plugins/org.eclipse.actf.examples.scripteditor/src/org/eclipse/actf/ai/scripteditor/util/TTMLUtil.java
index 190f179..e9e5477 100644
--- a/plugins/org.eclipse.actf.examples.scripteditor/src/org/eclipse/actf/ai/scripteditor/util/TTMLUtil.java
+++ b/plugins/org.eclipse.actf.examples.scripteditor/src/org/eclipse/actf/ai/scripteditor/util/TTMLUtil.java

@@ -158,7 +158,7 @@
 
 				String strDesc = instScriptData.getScriptData(i);
 
-				// TODO diff duration with next item				
+				// TODO diff duration with next item
 				writer.print("    <p xml:id=\"description" + i + "\" begin=\""
 						+ strStartTime);
 				if (instScriptData.getExtendExtended(i)) {

diff --git a/plugins/org.eclipse.actf.examples.scripteditor/src/org/eclipse/actf/ai/scripteditor/util/VoicePlayerFactory.java b/plugins/org.eclipse.actf.examples.scripteditor/src/org/eclipse/actf/ai/scripteditor/util/VoicePlayerFactory.java
index 15f74f1..d1945c4 100644
--- a/plugins/org.eclipse.actf.examples.scripteditor/src/org/eclipse/actf/ai/scripteditor/util/VoicePlayerFactory.java
+++ b/plugins/org.eclipse.actf.examples.scripteditor/src/org/eclipse/actf/ai/scripteditor/util/VoicePlayerFactory.java

@@ -106,10 +106,10 @@
 		return (VE_NOSUPPORT);
 	}
 
-	public void setLang(String language){
+	public void setLang(String language) {
 		voice.getTTSEngine().setLanguage(language);
 	}
-	
+
 	/**
 	 * Setter methods
 	 */
@@ -203,19 +203,19 @@
 		// return current Mora's counter
 		return (mora);
 	}
-	
-	public boolean canSpeakToFile(){
+
+	public boolean canSpeakToFile() {
 		return voice.getTTSEngine().canSpeakToFile();
 	}
 
-	public boolean speakToFile(String target, File targetFile){
+	public boolean speakToFile(String target, File targetFile) {
 		ITTSEngine engine = voice.getTTSEngine();
-		if(engine.canSpeakToFile()){
-			return(engine.speakToFile(target, targetFile));
+		if (engine.canSpeakToFile()) {
+			return (engine.speakToFile(target, targetFile));
 		}
 		return false;
 	}
-	
+
 	/**
 	 * Local class implements IVoiceEventListener
 	 */

diff --git a/plugins/org.eclipse.actf.examples.scripteditor/src/org/eclipse/actf/ai/scripteditor/util/WavUtil.java b/plugins/org.eclipse.actf.examples.scripteditor/src/org/eclipse/actf/ai/scripteditor/util/WavUtil.java
index 06a7d0e..e572d57 100644
--- a/plugins/org.eclipse.actf.examples.scripteditor/src/org/eclipse/actf/ai/scripteditor/util/WavUtil.java
+++ b/plugins/org.eclipse.actf.examples.scripteditor/src/org/eclipse/actf/ai/scripteditor/util/WavUtil.java

@@ -20,7 +20,8 @@
 public class WavUtil {
 
 	/**
-	 * @param file target WAV file
+	 * @param file
+	 *            target WAV file
 	 * @return length of WAV file in Microsecond
 	 */
 	public static long getMicrosecondLength(File file) {
@@ -36,9 +37,10 @@
 		}
 		return result;
 	}
-	
+
 	/**
-	 * @param file target WAV file
+	 * @param file
+	 *            target WAV file
 	 * @return length of WAV file in Millisecond
 	 */
 	public static double getMillisecondLength(File file) {
@@ -46,11 +48,12 @@
 		if (result == -1) {
 			return -1;
 		}
-		return result / (double)1000;
+		return result / (double) 1000;
 	}
 
 	/**
-	 * @param file target WAV file
+	 * @param file
+	 *            target WAV file
 	 * @return length of WAV file in Second
 	 */
 	public static double getLength(File file) {
@@ -58,7 +61,7 @@
 		if (result == -1) {
 			return -1;
 		}
-		return result / (double)1000000;
+		return result / (double) 1000000;
 	}
 
 }

diff --git a/plugins/org.eclipse.actf.examples.scripteditor/src/org/eclipse/actf/ai/scripteditor/util/WebBrowserFactory.java b/plugins/org.eclipse.actf.examples.scripteditor/src/org/eclipse/actf/ai/scripteditor/util/WebBrowserFactory.java
index 3c0d816..37df84e 100644
--- a/plugins/org.eclipse.actf.examples.scripteditor/src/org/eclipse/actf/ai/scripteditor/util/WebBrowserFactory.java
+++ b/plugins/org.eclipse.actf.examples.scripteditor/src/org/eclipse/actf/ai/scripteditor/util/WebBrowserFactory.java

@@ -65,8 +65,8 @@
 		curBrowser = webBrowser;
 		curMediaInfo = getMediaInfo(webBrowser);
 	}
-	
-	public void removeWebBrowser(IWebBrowserACTF webBrowser){
+
+	public void removeWebBrowser(IWebBrowserACTF webBrowser) {
 		mediaMap.remove(webBrowser);
 		curBrowser = null;
 		curMediaInfo = null;
@@ -93,11 +93,11 @@
 		// searchVideo();
 		// }
 
-		if (curBrowser == null){
+		if (curBrowser == null) {
 			IModelService model = ModelServiceUtils.getActiveModelService();
-			if(model instanceof IWebBrowserACTF){
-				setCurrentWebBrowser((IWebBrowserACTF)model);
-			}else{
+			if (model instanceof IWebBrowserACTF) {
+				setCurrentWebBrowser((IWebBrowserACTF) model);
+			} else {
 				return;
 			}
 		}
@@ -118,9 +118,9 @@
 		// checkFlag becomes true when mediaSearchRequest() is called.
 		if (curBrowser == null) {
 			IModelService model = ModelServiceUtils.getActiveModelService();
-			if(model instanceof IWebBrowserACTF){
-				setCurrentWebBrowser((IWebBrowserACTF)model);
-			}else{
+			if (model instanceof IWebBrowserACTF) {
+				setCurrentWebBrowser((IWebBrowserACTF) model);
+			} else {
 				return;
 			}
 		}
@@ -198,32 +198,33 @@
 		if (curMediaInfo != null && curMediaInfo.videos.length > 0) {
 			double readTime = pos / SEC2MSEC;
 			for (int i = 0; i < curMediaInfo.videos.length; i++) {
-				result = curMediaInfo.videos[i].setCurrentPosition(readTime) & result;
+				result = curMediaInfo.videos[i].setCurrentPosition(readTime)
+						& result;
 			}
 			return result;
 		} else {
 			return false;
 		}
 	}
-	
-	public void showCurrentImage(){
+
+	public void showCurrentImage() {
 		int status = getVideoStatus();
-		if(status==2 || status==3){
+		if (status == 2 || status == 3) {
 			playMedia();
 			pauseMedia();
-		}		
+		}
 	}
 
-	public String getVideoURL(){
+	public String getVideoURL() {
 		// TODO cache
 		checkVideo();
 		if (curMediaInfo != null && curMediaInfo.videos.length > 0) {
-			//TODO
+			// TODO
 			return curMediaInfo.videos[0].getVideoURL();
 		}
 		return null;
 	}
-	
+
 	public int getTotalLength() {
 
 		// TODO cache
@@ -231,19 +232,19 @@
 		if (curMediaInfo != null && curMediaInfo.videos.length > 0) {
 			double max = 0;
 			double tmp = 0;
-			for (int i=0; i<curMediaInfo.videos.length;i++){
+			for (int i = 0; i < curMediaInfo.videos.length; i++) {
 				tmp = curMediaInfo.videos[i].getTotalLength();
-				if(tmp>max){
+				if (tmp > max) {
 					max = tmp;
 				}
-//				System.out.println(curMediaInfo.videos[i].getVideoURL());
+				// System.out.println(curMediaInfo.videos[i].getVideoURL());
 			}
 			int length = (int) Math.ceil(max * 1000);
 
-			//TODO
-			if(length==0){
+			// TODO
+			if (length == 0) {
 				length = 600000;
-			}						
+			}
 			return (length);
 		} else {
 			return (0);

diff --git a/plugins/org.eclipse.actf.examples.scripteditor/src/org/eclipse/actf/ai/ui/scripteditor/views/TimeLineView.java b/plugins/org.eclipse.actf.examples.scripteditor/src/org/eclipse/actf/ai/ui/scripteditor/views/TimeLineView.java
index 3f74a0e..b2dd522 100644
--- a/plugins/org.eclipse.actf.examples.scripteditor/src/org/eclipse/actf/ai/ui/scripteditor/views/TimeLineView.java
+++ b/plugins/org.eclipse.actf.examples.scripteditor/src/org/eclipse/actf/ai/ui/scripteditor/views/TimeLineView.java

@@ -1151,7 +1151,7 @@
 
 		// Update location of current Composite
 		childComposite.setLocation(nextCentre, nowPon.y);
-		
+
 		WebBrowserFactory.getInstance().setCurrentPosition(nextStartTime);
 	}
 

diff --git a/plugins/org.eclipse.actf.examples.scripteditor/src/org/eclipse/actf/examples/scripteditor/ApplicationWorkbenchWindowAdvisor.java b/plugins/org.eclipse.actf.examples.scripteditor/src/org/eclipse/actf/examples/scripteditor/ApplicationWorkbenchWindowAdvisor.java
index bbcbb0f..225d388 100644
--- a/plugins/org.eclipse.actf.examples.scripteditor/src/org/eclipse/actf/examples/scripteditor/ApplicationWorkbenchWindowAdvisor.java
+++ b/plugins/org.eclipse.actf.examples.scripteditor/src/org/eclipse/actf/examples/scripteditor/ApplicationWorkbenchWindowAdvisor.java

@@ -49,9 +49,9 @@
 	public void postWindowOpen() {
 		super.postWindowOpen();
 		FlashCacheUtil.checkCache();
-		
+
 		ProxySettingUtil.setCurrentMode(ProxySettingUtil.PROXY_NONE);
-		
+
 		// Launch Web Browser
 		String strUrl = "about:blank";
 		URL helpUrl = PlatformUI

diff --git a/plugins/org.eclipse.actf.examples.scripteditor/src/org/eclipse/actf/examples/scripteditor/actions/ExportHTMLAction.java b/plugins/org.eclipse.actf.examples.scripteditor/src/org/eclipse/actf/examples/scripteditor/actions/ExportHTMLAction.java
index 260c4a1..cde532f 100644
--- a/plugins/org.eclipse.actf.examples.scripteditor/src/org/eclipse/actf/examples/scripteditor/actions/ExportHTMLAction.java
+++ b/plugins/org.eclipse.actf.examples.scripteditor/src/org/eclipse/actf/examples/scripteditor/actions/ExportHTMLAction.java

@@ -162,9 +162,9 @@
 			String dirName = saveFilepath.substring(0, index + 1);
 			String fileName;
 			if (last > 0) {
-				fileName = saveFilepath.substring(index+1, last);
+				fileName = saveFilepath.substring(index + 1, last);
 			} else {
-				fileName = saveFilepath.substring(index+1);
+				fileName = saveFilepath.substring(index + 1);
 			}
 
 			exportHTML(saveFilepath, fileName + "_ad.xml", true);
@@ -181,8 +181,8 @@
 			TTMLUtil.exportTTML(adFilepath, false);
 
 			adFilepath = dirName + fileName + "_ad_p.xml";
-			TTMLUtil.exportTTMLandWAV(adFilepath, dirName + "ad_files" + File.separator,
-					fileName, null, false);
+			TTMLUtil.exportTTMLandWAV(adFilepath, dirName + "ad_files"
+					+ File.separator, fileName, null, false);
 		}
 	}
 

diff --git a/plugins/org.eclipse.actf.examples.scripteditor/src/org/eclipse/actf/examples/scripteditor/actions/FlashAnalyzeAction.java b/plugins/org.eclipse.actf.examples.scripteditor/src/org/eclipse/actf/examples/scripteditor/actions/FlashAnalyzeAction.java
index e441791..9fb5f8e 100644
--- a/plugins/org.eclipse.actf.examples.scripteditor/src/org/eclipse/actf/examples/scripteditor/actions/FlashAnalyzeAction.java
+++ b/plugins/org.eclipse.actf.examples.scripteditor/src/org/eclipse/actf/examples/scripteditor/actions/FlashAnalyzeAction.java

@@ -32,8 +32,8 @@
 		WebBrowserFactory web = WebBrowserFactory.getInstance();
 		if (web != null) {
 			IModelService model = ModelServiceUtils.getActiveModelService();
-			if(model instanceof IWebBrowserACTF){
-				web.setCurrentWebBrowser((IWebBrowserACTF)model);
+			if (model instanceof IWebBrowserACTF) {
+				web.setCurrentWebBrowser((IWebBrowserACTF) model);
 			}
 			web.searchVideo();
 		}