[openrtm-commit:02549] r718 - in trunk/rtmtools/jp.go.aist.rtm.systemeditor: src/jp/go/aist/rtm/systemeditor/corba src/jp/go/aist/rtm/systemeditor/nl src/jp/go/aist/rtm/systemeditor/ui/dialog src/jp/go/aist/rtm/systemeditor/ui/views/managercontrolview test/jp/go/aist/rtm/systemeditor/ui/views/managercontrolview/mock

openrtm @ openrtm.org openrtm @ openrtm.org
2017年 3月 31日 (金) 15:26:46 JST


Author: ga
Date: 2017-03-31 15:26:46 +0900 (Fri, 31 Mar 2017)
New Revision: 718

Modified:
   trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/corba/CORBAHelper.java
   trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/nl/messages.properties
   trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/CreateComponentDialog.java
   trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/views/managercontrolview/ManagerControlView.java
   trunk/rtmtools/jp.go.aist.rtm.systemeditor/test/jp/go/aist/rtm/systemeditor/ui/views/managercontrolview/mock/RTCManagerMock.java
Log:


Modified: trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/corba/CORBAHelper.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/corba/CORBAHelper.java	2017-03-31 06:26:37 UTC (rev 717)
+++ trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/corba/CORBAHelper.java	2017-03-31 06:26:46 UTC (rev 718)
@@ -3,6 +3,11 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.openrtp.namespaces.rts.version02.ConfigurationData;
+import org.openrtp.namespaces.rts.version02.ConfigurationSet;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import jp.go.aist.rtm.nameserviceview.corba.NameServerAccesser;
 import jp.go.aist.rtm.toolscommon.model.component.Component;
 import jp.go.aist.rtm.toolscommon.model.component.CorbaComponent;
@@ -10,16 +15,12 @@
 import jp.go.aist.rtm.toolscommon.synchronizationframework.SynchronizationSupport;
 import jp.go.aist.rtm.toolscommon.util.RtsProfileHandler;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * CORBA操作に関するヘルパー
  */
 public class CORBAHelper {
 
-	private static final Logger LOGGER = LoggerFactory
-			.getLogger(CORBAHelper.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(CORBAHelper.class);
 
 	private static NS _ns = new NS();
 	private static Factory _factory = new Factory();
@@ -58,8 +59,7 @@
 		 * @return CORBAオブジェクト
 		 */
 		public org.omg.CORBA.Object resolve(String path) {
-			org.omg.CORBA.Object result = NameServerAccesser.getInstance()
-					.getObjectFromPathId(path);
+			org.omg.CORBA.Object result = NameServerAccesser.getInstance().getObjectFromPathId(path);
 			return result;
 		}
 
@@ -73,8 +73,7 @@
 		public RTM.Manager findManager(String path) {
 			int index = path.lastIndexOf("/");
 			String cid = path.substring(0, index);
-			return NameServerAccesser.getInstance()
-					.getManagerFromContextId(cid);
+			return NameServerAccesser.getInstance().getManagerFromContextId(cid);
 		}
 
 	}
@@ -95,8 +94,7 @@
 		 * @return リモートオブジェクトが生存している場合はtrue
 		 */
 		public boolean isAvailable(CorbaComponent comp) {
-			return (comp.getCorbaObject() != null && SynchronizationSupport
-					.ping(comp.getCorbaObject()));
+			return (comp.getCorbaObject() != null && SynchronizationSupport.ping(comp.getCorbaObject()));
 		}
 
 		/**
@@ -109,17 +107,13 @@
 		 * @return リモートオブジェクト
 		 * @throws CORBAException
 		 */
-		public RTC.RTObject createRTObject(CorbaComponent comp,
-				SystemDiagram diagram) throws CORBAException {
-			LOGGER.trace("createRTObject START comp=<{}> diagram=<{}>", comp,
-					diagram);
+		public RTC.RTObject createRTObject(CorbaComponent comp, SystemDiagram diagram) throws CORBAException {
+			LOGGER.trace("createRTObject START comp=<{}> diagram=<{}>", comp, diagram);
 			RTM.Manager manager = ns().findManager(comp.getPathId());
 			if (manager == null) {
-				throw new CORBAException(String.format(
-						"Fail to find manager: path=<%s>", comp.getPathId()));
+				throw new CORBAException(String.format("Fail to find manager: path=<%s>", comp.getPathId()));
 			}
 			String param = buildCreateComponentParam(comp);
-			LOGGER.info("createRTObject: cmd=<{}>", param);
 			RTC.RTObject rtobj = manager.create_component(param);
 			return rtobj;
 		}
@@ -134,21 +128,14 @@
 		 * @return リモートオブジェクト
 		 * @throws CORBAException
 		 */
-		public RTC.RTObject createCompositeRTObject(CorbaComponent comp,
-				SystemDiagram diagram) throws CORBAException {
-			LOGGER.trace(
-					"createCompositeRTObject START comp=<{}> diagram=<{}>",
-					comp, diagram);
+		public RTC.RTObject createCompositeRTObject(CorbaComponent comp, SystemDiagram diagram) throws CORBAException {
+			LOGGER.trace("createCompositeRTObject START comp=<{}> diagram=<{}>", comp, diagram);
 			RTM.Manager manager = ns().findManager(comp.getPathId());
 			if (manager == null) {
-				throw new CORBAException(String.format(
-						"Fail to find manager: path=<%s>", comp.getPathId()));
+				throw new CORBAException(String.format("Fail to find manager: path=<%s>", comp.getPathId()));
 			}
-			String exportedPorts = findConfiguration("exported_ports", comp,
-					diagram);
-			String param = buildCreateCompositeComponentParam(comp,
-					exportedPorts);
-			LOGGER.info("createCompositeRTObject: cmd=<{}>", param);
+			String exportedPorts = findConfiguration("exported_ports", comp, diagram);
+			String param = buildCreateCompositeComponentParam(comp, exportedPorts);
 			RTC.RTObject rtobj = manager.create_component(param);
 			return rtobj;
 		}
@@ -161,13 +148,11 @@
 		 *            CORBA 複合コンポーネント
 		 * @throws CORBAException
 		 */
-		public void setCompositeMembers(CorbaComponent comp)
-				throws CORBAException {
+		public void setCompositeMembers(CorbaComponent comp) throws CORBAException {
 			LOGGER.trace("setCompositeMembers START comp=<{}>", comp);
 			RTC.RTObject remote = comp.getCorbaObjectInterface();
 			if (remote == null) {
-				throw new CORBAException(String.format(
-						"Remote object does not loaded: comp=<{}>", comp));
+				throw new CORBAException(String.format("Remote object does not loaded: comp=<{}>", comp));
 			}
 			// 子RTCの CORBAオブジェクトリストを生成
 			List<_SDOPackage.SDO> sdolist = new ArrayList<_SDOPackage.SDO>();
@@ -175,10 +160,7 @@
 				CorbaComponent c = (CorbaComponent) o;
 				RTC.RTObject rtobj = c.getCorbaObjectInterface();
 				if (rtobj == null) {
-					throw new CORBAException(
-							String.format(
-									"Remote object of child does not loaded: comp=<{}>",
-									c));
+					throw new CORBAException(String.format("Remote object of child does not loaded: comp=<{}>", c));
 				}
 				sdolist.add(rtobj);
 			}
@@ -187,9 +169,7 @@
 				remote.get_owned_organizations()[0].set_members(sdos);
 			} catch (Exception e) {
 				remote.exit();
-				throw new CORBAException(String.format(
-						"Fail to set members: remote=<{}> sdos=<{}>", remote,
-						sdos));
+				throw new CORBAException(String.format("Fail to set members: remote=<{}> sdos=<{}>", remote, sdos));
 			}
 		}
 
@@ -204,18 +184,15 @@
 		 *            ダイアグラム
 		 * @return 設定値、パラメータが存在しなかった場合はブランク("")
 		 */
-		public String findConfiguration(String key, CorbaComponent comp,
-				SystemDiagram diagram) {
-			org.openrtp.namespaces.rts.version02.Component orig = RtsProfileHandler
-					.findComponent(comp, diagram.getProfile().getComponents());
+		public String findConfiguration(String key, CorbaComponent comp, SystemDiagram diagram) {
+			org.openrtp.namespaces.rts.version02.Component orig = RtsProfileHandler.findComponent(comp,
+					diagram.getProfile().getComponents());
 			String activeId = orig.getActiveConfigurationSet();
-			for (org.openrtp.namespaces.rts.version02.ConfigurationSet cs : orig
-					.getConfigurationSets()) {
+			for (ConfigurationSet cs : orig.getConfigurationSets()) {
 				if (!cs.getId().equals(activeId)) {
 					continue;
 				}
-				for (org.openrtp.namespaces.rts.version02.ConfigurationData cd : cs
-						.getConfigurationData()) {
+				for (ConfigurationData cd : cs.getConfigurationData()) {
 					if (cd.getName().equals(key)) {
 						return cd.getData();
 					}
@@ -243,12 +220,8 @@
 				return null;
 			}
 			StringBuffer ret = new StringBuffer();
-			ret.append(implementationId);
-			ret.append("?instance_name=").append(instanceName);
-			String pg = comp.getProperty("process_group");
-			if (pg != null) {
-				ret.append("&process_group=").append(pg);
-			}
+			ret.append(implementationId).append("?instance_name=");
+			ret.append(instanceName);
 			return ret.toString();
 		}
 
@@ -267,20 +240,10 @@
 		 *            公開ポート指定
 		 * @return コンポーネント生成パラメータ (失敗時はnull)
 		 */
-		public String buildCreateCompositeComponentParam(CorbaComponent comp,
-				String exportedPorts) {
+		public String buildCreateCompositeComponentParam(CorbaComponent comp, String exportedPorts) {
 			String compositeType = comp.getCompositeTypeL();
 			String instanceName = comp.getProperty("instance_name");
-			//
-			StringBuffer ret = new StringBuffer();
-			ret.append(buildCreateCompositeComponentParam(compositeType,
-					instanceName, exportedPorts));
-			//
-			String pg = comp.getProperty("process_group");
-			if (pg != null) {
-				ret.append("&process_group=").append(pg);
-			}
-			return ret.toString();
+			return buildCreateCompositeComponentParam(compositeType, instanceName, exportedPorts);
 		}
 
 		/**
@@ -294,16 +257,16 @@
 		 *            公開ポート指定
 		 * @return コンポーネント生成パラメータ (失敗時はnull)
 		 */
-		public String buildCreateCompositeComponentParam(String compositeType,
-				String instanceName, String exportedPorts) {
-			if (compositeType == null || instanceName == null
-					|| exportedPorts == null) {
+		public String buildCreateCompositeComponentParam(String compositeType, String instanceName,
+				String exportedPorts) {
+			if (compositeType == null || instanceName == null || exportedPorts == null) {
 				return null;
 			}
 			StringBuffer ret = new StringBuffer();
-			ret.append(compositeType).append("Composite");
-			ret.append("?instance_name=").append(instanceName);
-			ret.append("&exported_ports=").append(exportedPorts);
+			ret.append(compositeType).append("Composite?instance_name=");
+			ret.append(instanceName);
+			ret.append("&exported_ports=");
+			ret.append(exportedPorts);
 			return ret.toString();
 		}
 

Modified: trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/nl/messages.properties
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/nl/messages.properties	2017-03-31 06:26:37 UTC (rev 717)
+++ trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/nl/messages.properties	2017-03-31 06:26:46 UTC (rev 718)
@@ -93,7 +93,6 @@
 NewCompositeComponentDialog.msg.already_exist_name=The component name already exists.
 NewCompositeComponentDialog.msg.contain_grouping_fail=The Grouping composite component cannot be included in the composite components other than Grouping.
 CreateComponentDialog.2=Type : 
-CreateComponentDialog.process_group.title=Process Group : 
 CreateComponentDialog.3=Parameter : 
 CreateComponentDialog.6=Invalid parameter format.
 ServiceConnectorCreaterDialog.1=Please enter Port Profile.
@@ -273,17 +272,16 @@
 ManagerControlView.0=Loadable Modules
 ManagerControlView.1=module
 ManagerControlView.2=Loaded Modules
+ManagerControlView.3=module
 ManagerControlView.4=Active Components
 ManagerControlView.5=component
 ManagerControlView.6=Create
 ManagerControlView.7=Fork
-ManagerControlView.restart=Restart
 ManagerControlView.8=Shutdown
+ManagerControlView.9=module
 ManagerControlView.10=URL : 
 ManagerControlView.11=Load
 ManagerControlView.13=Unload
-ManagerControlView.delete_component=Delete Component
-ManagerControlView.process_group=process group
 CompositeComponentView.label.component_name=component: 
 CompositeComponentView.label.component_type=type: 
 CompositeComponentView.column.component.label=component

Modified: trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/CreateComponentDialog.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/CreateComponentDialog.java	2017-03-31 06:26:37 UTC (rev 717)
+++ trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/CreateComponentDialog.java	2017-03-31 06:26:46 UTC (rev 718)
@@ -1,9 +1,8 @@
 package jp.go.aist.rtm.systemeditor.ui.dialog;
 
-import java.util.List;
-
 import jp.go.aist.rtm.systemeditor.nl.Messages;
 
+import org.eclipse.emf.common.util.EList;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.IMessageProvider;
 import org.eclipse.jface.dialogs.TitleAreaDialog;
@@ -25,49 +24,38 @@
  */
 public class CreateComponentDialog extends TitleAreaDialog {
 
-	private static final String LABEL_TYPE_TITLE = Messages
-			.getString("CreateComponentDialog.2");
-	private static final String LABEL_PROCESS_GROUP_TITLE = Messages
-			.getString("CreateComponentDialog.process_group.title");
-	private static final String LABEL_PARAMETER_TITLE = Messages
-			.getString("CreateComponentDialog.3");
-	private static final String ERR_INVALID_PARAM = Messages
-			.getString("CreateComponentDialog.6");
+	public static final String CONFIG_NAME = "CONFIG_NAME"; //$NON-NLS-1$
 
-	public static final String CONFIG_NAME = "CONFIG_NAME";
-	public static final String CONFIG_VALUE = "CONFIG_VALUE";
+	public static final String CONFIG_VALUE = "CONFIG_VALUE"; //$NON-NLS-1$
 
 	public static final int BUTTON_WIDTH = 70;
 
 	private String parameter;
+
 	private Text paramText;
+
 	private Combo typeCombo;
-	private Combo processGroupCombo;
-	private List<String> typeList;
-	private List<String> processGroupList;
 
+	@SuppressWarnings("unchecked")
+	private EList typeList;
+	
 	public CreateComponentDialog(Shell parentShell) {
 		super(parentShell);
 		setHelpAvailable(false);
 		setShellStyle(getShellStyle() | SWT.CENTER | SWT.RESIZE);
 	}
 
-	public void setTypeList(List<String> typeList) {
+	@SuppressWarnings("unchecked")
+	public void setTypeList(EList typeList) {
 		this.typeList = typeList;
 	}
-
-	public void setProcessGroupList(List<String> processGroupList) {
-		this.processGroupList = processGroupList;
-	}
-
 	public String getParameter() {
 		return this.parameter;
 	}
 
 	@Override
 	protected Control createDialogArea(Composite parent) {
-		Composite mainComposite = new Composite(
-				(Composite) super.createDialogArea(parent), SWT.NONE);
+		Composite mainComposite = new Composite((Composite) super.createDialogArea(parent), SWT.NONE);
 
 		GridLayout gl;
 		gl = new GridLayout(2, false);
@@ -75,56 +63,38 @@
 		mainComposite.setFont(parent.getFont());
 		mainComposite.setLayoutData(new GridData(GridData.FILL_BOTH));
 
-		Label typeLabel = new Label(mainComposite, SWT.NONE);
-		typeLabel.setText(LABEL_TYPE_TITLE);
-		this.typeCombo = new Combo(mainComposite, SWT.NONE);
+		Label type = new Label(mainComposite, SWT.NONE);
+		type.setText(Messages.getString("CreateComponentDialog.2")); //$NON-NLS-1$
+		typeCombo = new Combo(mainComposite, SWT.NONE);
 		GridData gd = new GridData(GridData.GRAB_HORIZONTAL);
 		gd.minimumWidth = 180;
 		gd.horizontalAlignment = GridData.FILL;
 		gd.grabExcessHorizontalSpace = true;
-		this.typeCombo.setLayoutData(gd);
-		for (String type : this.typeList) {
-			this.typeCombo.add(type);
+		typeCombo.setLayoutData(gd);
+		for (Object typeObject : typeList) {
+			typeCombo.add(typeObject.toString());
 		}
-		this.typeCombo.select(0);
-		this.parameter = this.typeCombo.getText();
-		this.typeCombo.addModifyListener(new ModifyListener() {
+		typeCombo.select(0);
+		parameter = typeCombo.getText();
+		typeCombo.addModifyListener(new ModifyListener() {
 			public void modifyText(ModifyEvent e) {
 				notifyModified();
 			}
 		});
-
-		Label pgLabel = new Label(mainComposite, SWT.NONE);
-		pgLabel.setText(LABEL_PROCESS_GROUP_TITLE);
-		this.processGroupCombo = new Combo(mainComposite, SWT.NONE);
-		gd = new GridData(GridData.GRAB_HORIZONTAL);
-		gd.minimumWidth = 180;
-		gd.horizontalAlignment = GridData.FILL;
-		gd.grabExcessHorizontalSpace = true;
-		this.processGroupCombo.setLayoutData(gd);
-		for (String pg : this.processGroupList) {
-			this.processGroupCombo.add(pg);
-		}
-		this.processGroupCombo.select(0);
-		this.processGroupCombo.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				notifyModified();
-			}
-		});
-
-		Label paramLabel = new Label(mainComposite, SWT.NONE);
-		paramLabel.setText(LABEL_PARAMETER_TITLE);
-		this.paramText = new Text(mainComposite, SWT.MULTI | SWT.BORDER
-				| SWT.V_SCROLL | SWT.WRAP);
+		
+		Label param = new Label(mainComposite, SWT.NONE);
+		param.setText(Messages.getString("CreateComponentDialog.3")); //$NON-NLS-1$
+		paramText = new Text(mainComposite, SWT.MULTI | SWT.BORDER
+						| SWT.V_SCROLL | SWT.WRAP);
 		gd = new GridData();
 		gd.horizontalAlignment = GridData.FILL;
 		gd.verticalAlignment = GridData.FILL;
 		gd.grabExcessHorizontalSpace = true;
 		gd.grabExcessVerticalSpace = true;
 		gd.heightHint = 240;
-		this.paramText.setLayoutData(gd);
-		this.paramText.setText("");
-		this.paramText.addModifyListener(new ModifyListener() {
+		paramText.setLayoutData(gd);
+		paramText.setText(""); //$NON-NLS-1$
+		paramText.addModifyListener(new ModifyListener() {
 			public void modifyText(ModifyEvent e) {
 				notifyModified();
 			}
@@ -144,22 +114,7 @@
 	 * 変更を通知します。
 	 */
 	private void notifyModified() {
-		this.parameter = this.typeCombo.getText();
-		StringBuffer sb = new StringBuffer();
-		String pg = this.processGroupCombo.getText();
-		if (pg != null && !pg.isEmpty()) {
-			sb.append("process_group=" + pg);
-		}
-		String pm = this.paramText.getText();
-		if (pm != null && !pm.isEmpty()) {
-			if (sb.length() > 0) {
-				sb.append("&");
-			}
-			sb.append(pm);
-		}
-		if (sb.length() > 0) {
-			this.parameter += "?" + sb.toString();
-		}
+		parameter = typeCombo.getText() + "?" + paramText.getText(); //$NON-NLS-1$
 		if (!validateInput()) {
 			getButton(IDialogConstants.OK_ID).setEnabled(false);
 		} else {
@@ -171,9 +126,9 @@
 		if (this.parameter == null || this.parameter.length() == 0) {
 			return false;
 		}
-		String errmsg = ERR_INVALID_PARAM;
-		String p[] = this.parameter.split("\\?");
-		if (p.length > 0 && p[0].indexOf("&") != -1) {
+		String errmsg = Messages.getString("CreateComponentDialog.6"); //$NON-NLS-1$
+		String p[] = this.parameter.split("\\?"); //$NON-NLS-1$
+		if (p.length > 0 && p[0].indexOf("&") != -1) { //$NON-NLS-1$
 			// component_nameに&が入っている
 			this.setMessage(errmsg, IMessageProvider.WARNING);
 			return false;
@@ -184,5 +139,4 @@
 		}
 		return true;
 	}
-
 }

Modified: trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/views/managercontrolview/ManagerControlView.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/views/managercontrolview/ManagerControlView.java	2017-03-31 06:26:37 UTC (rev 717)
+++ trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/views/managercontrolview/ManagerControlView.java	2017-03-31 06:26:46 UTC (rev 718)
@@ -9,7 +9,6 @@
 import jp.go.aist.rtm.toolscommon.model.manager.RTCManager;
 import jp.go.aist.rtm.toolscommon.ui.views.propertysheetview.RtcPropertySheetPage;
 import jp.go.aist.rtm.toolscommon.util.AdapterUtil;
-import jp.go.aist.rtm.toolscommon.util.SDOUtil;
 
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.viewers.ArrayContentProvider;
@@ -17,9 +16,6 @@
 import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.ISelectionProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableColorProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
@@ -28,8 +24,6 @@
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
@@ -42,8 +36,6 @@
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.part.ViewPart;
 import org.eclipse.ui.views.properties.IPropertySheetPage;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * マネージャ管理ビュー
@@ -51,67 +43,45 @@
  */
 public class ManagerControlView extends ViewPart {
 
-	private static final Logger LOGGER = LoggerFactory
-			.getLogger(ManagerControlView.class);
+	private static final int MENU_BUTTON_WIDTH = 120;
 
-	private static final String LABEL_LOADABLE_MODULE_BUTTON = Messages
-			.getString("ManagerControlView.0");
-	private static final String LABEL_LOADED_MODULE_BUTTON = Messages
-			.getString("ManagerControlView.2");
-	private static final String LABEL_ACTIVE_COMPONENT_BUTTON = Messages
-			.getString("ManagerControlView.4");
-	private static final String LABEL_CREATE_BUTTON = Messages
-			.getString("ManagerControlView.6");
-	private static final String LABEL_FORK_BUTTON = Messages
-			.getString("ManagerControlView.7");
-	private static final String LABEL_RESTART_BUTTON = Messages
-			.getString("ManagerControlView.restart");
-	private static final String LABEL_SHUTDOWN_BUTTON = Messages
-			.getString("ManagerControlView.8");
+	private static final int EXEC_BUTTON_WIDTH = 70;
 
-	private static final String LABEL_LOAD_BUTTON = Messages
-			.getString("ManagerControlView.11");
-	private static final String LABEL_UPLOAD_BUTTON = Messages
-			.getString("ManagerControlView.13");
-	private static final String LABEL_DELETE_COMPONENT_BUTTON = Messages
-			.getString("ManagerControlView.delete_component");
+	private Composite composite = null;
 
-	private static final String LABEL_MODULE_COLUMN = Messages
-			.getString("ManagerControlView.1");
-	private static final String LABEL_COMPONENT_COLUMN = Messages
-			.getString("ManagerControlView.5");
-	private static final String LABEL_PROCESS_GROUP_COLUMN = Messages
-			.getString("ManagerControlView.process_group");
+	private RTCManager targetManager;
 
-	private static final String LABEL_URL_TEXT = Messages
-			.getString("ManagerControlView.10");
-
-	private static final int MENU_BUTTON_WIDTH = 160;
-	private static final int EXEC_BUTTON_WIDTH = 160;
-
-	private Composite composite = null;
 	private Button loadedModuleButton;
+
 	private Button loadableModuleButton;
+
 	private Button activeComponentButton;
+
 	private Button createButton;
+
 	private Button forkButton;
-	private Button restartButton;
+
 	private Button shutdownButton;
+
 	private Table modulesTable;
+
 	private TableViewer modulesTableViewer;
-	private TableColumn moduleColumn1;
-	private TableColumn moduleColumn2;
+
+	private TableColumn moduleColumn;
+
 	private Button loadButton;
+
 	private Button unloadButton;
-	private Button deleteComponentButton;
+
 	private Text urlText;
 
 	private boolean isSelectedLoadableModules;
+
 	private boolean isSelectedLoadedModules;
+
 	private boolean isSelectedActiveComponents;
 
-	private RTCManager targetManager;
-	private List<String[]> moduleList;
+	private List<String> moduleList;
 
 	public ManagerControlView() {
 	}
@@ -123,11 +93,10 @@
 
 		gl = new GridLayout();
 		gl.numColumns = 3;
-		this.composite = new Composite(parent, SWT.FILL);
-		this.composite.setLayout(gl);
+		composite = new Composite(parent, SWT.FILL);
+		composite.setLayout(gl);
 
-		final Composite menuButtonComposite = new Composite(this.composite,
-				SWT.NONE);
+		final Composite menuButtonComposite = new Composite(composite, SWT.NONE);
 		gl = new GridLayout();
 		gd = new GridData();
 		gd.horizontalAlignment = SWT.FILL;
@@ -136,21 +105,20 @@
 		menuButtonComposite.setLayout(gl);
 		menuButtonComposite.setLayoutData(gd);
 
-		this.loadableModuleButton = new Button(menuButtonComposite, SWT.TOP);
-		this.loadableModuleButton.setText(LABEL_LOADABLE_MODULE_BUTTON);
+		loadableModuleButton = new Button(menuButtonComposite, SWT.TOP);
+		loadableModuleButton.setText(Messages.getString("ManagerControlView.0")); //$NON-NLS-1$
 		gd = new GridData();
 		gd.widthHint = MENU_BUTTON_WIDTH;
-		this.loadableModuleButton.setLayoutData(gd);
-		this.loadableModuleButton.setEnabled(false);
-		this.loadableModuleButton.addSelectionListener(new SelectionAdapter() {
+		loadableModuleButton.setLayoutData(gd);
+		loadableModuleButton.setEnabled(false);
+		loadableModuleButton.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				isSelectedLoadableModules = false;
 				isSelectedLoadedModules = false;
 				isSelectedActiveComponents = false;
 				if (targetManager != null) {
-					moduleColumn1.setText(LABEL_MODULE_COLUMN);
-					moduleColumn2.setText("");
+					moduleColumn.setText(Messages.getString("ManagerControlView.1")); //$NON-NLS-1$
 					isSelectedLoadableModules = true;
 					// キャッシュ更新
 					targetManager.getLoadableModuleProfilesR();
@@ -159,21 +127,20 @@
 			}
 		});
 
-		this.loadedModuleButton = new Button(menuButtonComposite, SWT.TOP);
-		this.loadedModuleButton.setText(LABEL_LOADED_MODULE_BUTTON);
+		loadedModuleButton = new Button(menuButtonComposite, SWT.TOP);
+		loadedModuleButton.setText(Messages.getString("ManagerControlView.2")); //$NON-NLS-1$
 		gd = new GridData();
 		gd.widthHint = MENU_BUTTON_WIDTH;
-		this.loadedModuleButton.setLayoutData(gd);
-		this.loadedModuleButton.setEnabled(false);
-		this.loadedModuleButton.addSelectionListener(new SelectionAdapter() {
+		loadedModuleButton.setLayoutData(gd);
+		loadedModuleButton.setEnabled(false);
+		loadedModuleButton.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				isSelectedLoadableModules = false;
 				isSelectedLoadedModules = false;
 				isSelectedActiveComponents = false;
 				if (targetManager != null) {
-					moduleColumn1.setText(LABEL_MODULE_COLUMN);
-					moduleColumn2.setText("");
+					moduleColumn.setText(Messages.getString("ManagerControlView.3")); //$NON-NLS-1$
 					isSelectedLoadedModules = true;
 					// キャッシュ更新
 					targetManager.getLoadedModuleProfilesR();
@@ -182,21 +149,20 @@
 			}
 		});
 
-		this.activeComponentButton = new Button(menuButtonComposite, SWT.TOP);
-		this.activeComponentButton.setText(LABEL_ACTIVE_COMPONENT_BUTTON);
+		activeComponentButton = new Button(menuButtonComposite, SWT.TOP);
+		activeComponentButton.setText(Messages.getString("ManagerControlView.4")); //$NON-NLS-1$
 		gd = new GridData();
 		gd.widthHint = MENU_BUTTON_WIDTH;
-		this.activeComponentButton.setLayoutData(gd);
-		this.activeComponentButton.setEnabled(false);
-		this.activeComponentButton.addSelectionListener(new SelectionAdapter() {
+		activeComponentButton.setLayoutData(gd);
+		activeComponentButton.setEnabled(false);
+		activeComponentButton.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				isSelectedLoadableModules = false;
 				isSelectedLoadedModules = false;
 				isSelectedActiveComponents = false;
 				if (targetManager != null) {
-					moduleColumn1.setText(LABEL_COMPONENT_COLUMN);
-					moduleColumn2.setText(LABEL_PROCESS_GROUP_COLUMN);
+					moduleColumn.setText(Messages.getString("ManagerControlView.5")); //$NON-NLS-1$
 					isSelectedActiveComponents = true;
 					// キャッシュ更新
 					targetManager.getComponentProfilesR();
@@ -205,13 +171,13 @@
 			}
 		});
 
-		this.createButton = new Button(menuButtonComposite, SWT.TOP);
-		this.createButton.setText(LABEL_CREATE_BUTTON);
+		createButton = new Button(menuButtonComposite, SWT.TOP);
+		createButton.setText(Messages.getString("ManagerControlView.6")); //$NON-NLS-1$
 		gd = new GridData();
 		gd.widthHint = MENU_BUTTON_WIDTH;
-		this.createButton.setLayoutData(gd);
-		this.createButton.setEnabled(false);
-		this.createButton.addSelectionListener(new SelectionAdapter() {
+		createButton.setLayoutData(gd);
+		createButton.setEnabled(false);
+		createButton.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				if (targetManager == null) {
@@ -220,22 +186,19 @@
 				CreateComponentDialog dialog = new CreateComponentDialog(
 						getSite().getShell());
 				dialog.setTypeList(targetManager.getFactoryProfileTypeNamesR());
-				dialog.setProcessGroupList(targetManager.getSlaveManagerNames());
 				if (dialog.open() == IDialogConstants.OK_ID) {
-					String cmd = dialog.getParameter();
-					LOGGER.info("create command: <{}>", cmd);
-					targetManager.createComponentR(cmd);
+					targetManager.createComponentR(dialog.getParameter());
 				}
 			}
 		});
 
-		this.forkButton = new Button(menuButtonComposite, SWT.TOP);
-		this.forkButton.setText(LABEL_FORK_BUTTON);
+		forkButton = new Button(menuButtonComposite, SWT.TOP);
+		forkButton.setText(Messages.getString("ManagerControlView.7")); //$NON-NLS-1$
 		gd = new GridData();
 		gd.widthHint = MENU_BUTTON_WIDTH;
-		this.forkButton.setLayoutData(gd);
-		this.forkButton.setEnabled(false);
-		this.forkButton.addSelectionListener(new SelectionAdapter() {
+		forkButton.setLayoutData(gd);
+		forkButton.setEnabled(false);
+		forkButton.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				if (targetManager != null) {
@@ -245,33 +208,16 @@
 			}
 		});
 
-		this.restartButton = new Button(menuButtonComposite, SWT.TOP);
-		this.restartButton.setText(LABEL_RESTART_BUTTON);
+		shutdownButton = new Button(menuButtonComposite, SWT.TOP);
+		shutdownButton.setText(Messages.getString("ManagerControlView.8")); //$NON-NLS-1$
 		gd = new GridData();
 		gd.widthHint = MENU_BUTTON_WIDTH;
-		this.restartButton.setLayoutData(gd);
-		this.restartButton.setEnabled(false);
-		this.restartButton.addSelectionListener(new SelectionAdapter() {
+		shutdownButton.setLayoutData(gd);
+		shutdownButton.setEnabled(false);
+		shutdownButton.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				if (targetManager != null) {
-					targetManager.restartR();
-					targetManager = null;
-				}
-				buildData();
-			}
-		});
-
-		this.shutdownButton = new Button(menuButtonComposite, SWT.TOP);
-		this.shutdownButton.setText(LABEL_SHUTDOWN_BUTTON);
-		gd = new GridData();
-		gd.widthHint = MENU_BUTTON_WIDTH;
-		this.shutdownButton.setLayoutData(gd);
-		this.shutdownButton.setEnabled(false);
-		this.shutdownButton.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				if (targetManager != null) {
 					targetManager.shutdownR();
 					targetManager = null;
 				}
@@ -279,7 +225,7 @@
 			}
 		});
 
-		final Composite listComposite = new Composite(this.composite, SWT.FILL);
+		final Composite listComposite = new Composite(composite, SWT.FILL);
 		gl = new GridLayout();
 		gl.marginWidth = 0;
 		gl.marginHeight = 0;
@@ -292,11 +238,11 @@
 		listComposite.setLayout(gl);
 		listComposite.setLayoutData(gd);
 
-		this.modulesTableViewer = new TableViewer(listComposite,
-				SWT.FULL_SELECTION | SWT.SINGLE | SWT.BORDER);
-		this.modulesTableViewer.setContentProvider(new ArrayContentProvider());
+		modulesTableViewer = new TableViewer(listComposite, SWT.FULL_SELECTION
+				| SWT.SINGLE | SWT.BORDER);
+		modulesTableViewer.setContentProvider(new ArrayContentProvider());
 
-		this.modulesTable = this.modulesTableViewer.getTable();
+		modulesTable = modulesTableViewer.getTable();
 		gl = new GridLayout(1, false);
 		gl.numColumns = 1;
 		gd = new GridData();
@@ -305,11 +251,11 @@
 		gd.grabExcessVerticalSpace = true;
 		gd.grabExcessHorizontalSpace = true;
 		gd.horizontalSpan = 2;
-		this.modulesTable.setLayout(gl);
-		this.modulesTable.setLayoutData(gd);
-		this.modulesTable.setLinesVisible(true);
-		this.modulesTable.setHeaderVisible(true);
-		this.modulesTable.addSelectionListener(new SelectionListener() {
+		modulesTable.setLayout(gl);
+		modulesTable.setLayoutData(gd);
+		modulesTable.setLinesVisible(true);
+		modulesTable.setHeaderVisible(true);
+		modulesTable.addSelectionListener(new SelectionListener() {
 			public void widgetSelected(SelectionEvent e) {
 				updateEnableLoadButton();
 			}
@@ -319,35 +265,29 @@
 			}
 		});
 
-		this.moduleColumn1 = new TableColumn(this.modulesTable, SWT.NONE);
-		this.moduleColumn1.setText(LABEL_MODULE_COLUMN);
-		this.moduleColumn1.setWidth(300);
-		this.moduleColumn2 = new TableColumn(this.modulesTable, SWT.NONE);
-		this.moduleColumn2.setText("");
-		this.moduleColumn2.setWidth(300);
+		moduleColumn = new TableColumn(modulesTable, SWT.NONE);
+		moduleColumn.setText(Messages.getString("ManagerControlView.9")); //$NON-NLS-1$
+		moduleColumn.setWidth(300);
 
-		this.modulesTableViewer.setLabelProvider(new ModuleLabelProvider());
-
 		Label urlLabel = new Label(listComposite, SWT.NONE);
 		gd = new GridData();
 		urlLabel.setLayoutData(gd);
-		urlLabel.setText(LABEL_URL_TEXT);
+		urlLabel.setText(Messages.getString("ManagerControlView.10")); //$NON-NLS-1$
 
-		this.urlText = new Text(listComposite, SWT.SINGLE | SWT.BORDER);
+		urlText = new Text(listComposite, SWT.SINGLE | SWT.BORDER);
 		gd = new GridData();
 		gd.horizontalAlignment = SWT.FILL;
 		gd.grabExcessHorizontalSpace = true;
-		this.urlText.setLayoutData(gd);
-		this.urlText.setTextLimit(255);
-		this.urlText.setEnabled(false);
-		this.urlText.addModifyListener(new ModifyListener() {
+		urlText.setLayoutData(gd);
+		urlText.setTextLimit(255);
+		urlText.setEnabled(false);
+		urlText.addModifyListener(new ModifyListener() {
 			public void modifyText(ModifyEvent e) {
 				updateEnableLoadButton();
 			}
 		});
 
-		final Composite execButtonComposite = new Composite(this.composite,
-				SWT.NONE);
+		final Composite execButtonComposite = new Composite(composite, SWT.NONE);
 		gl = new GridLayout();
 		gd = new GridData();
 		gd.horizontalAlignment = SWT.FILL;
@@ -356,22 +296,21 @@
 		execButtonComposite.setLayout(gl);
 		execButtonComposite.setLayoutData(gd);
 
-		this.loadButton = new Button(execButtonComposite, SWT.TOP);
-		this.loadButton.setText(LABEL_LOAD_BUTTON);
+		loadButton = new Button(execButtonComposite, SWT.TOP);
+		loadButton.setText(Messages.getString("ManagerControlView.11")); //$NON-NLS-1$
 		gd = new GridData();
 		gd.widthHint = EXEC_BUTTON_WIDTH;
-		this.loadButton.setLayoutData(gd);
-		this.loadButton.setEnabled(false);
-		this.loadButton.addSelectionListener(new SelectionAdapter() {
+		loadButton.setLayoutData(gd);
+		loadButton.setEnabled(false);
+		loadButton.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				if (targetManager != null) {
 					String module = null;
 					if (modulesTable.getSelectionIndex() != -1) {
 						if (isSelectedLoadableModules) {
-							String[] m = moduleList.get(modulesTable
+							module = moduleList.get(modulesTable
 									.getSelectionIndex());
-							module = m[0];
 						}
 					} else if (urlText.getText().length() > 0) {
 						module = urlText.getText();
@@ -385,22 +324,21 @@
 			}
 		});
 
-		this.unloadButton = new Button(execButtonComposite, SWT.TOP);
-		this.unloadButton.setText(LABEL_UPLOAD_BUTTON);
+		unloadButton = new Button(execButtonComposite, SWT.TOP);
+		unloadButton.setText(Messages.getString("ManagerControlView.13")); //$NON-NLS-1$
 		gd = new GridData();
 		gd.widthHint = EXEC_BUTTON_WIDTH;
-		this.unloadButton.setLayoutData(gd);
-		this.unloadButton.setEnabled(false);
-		this.unloadButton.addSelectionListener(new SelectionAdapter() {
+		unloadButton.setLayoutData(gd);
+		unloadButton.setEnabled(false);
+		unloadButton.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				if (targetManager != null) {
 					if (isSelectedLoadedModules) {
 						if (modulesTable.getSelectionIndex() != -1) {
-							String[] m = moduleList.get(modulesTable
+							String mn = moduleList.get(modulesTable
 									.getSelectionIndex());
-							String module = m[0];
-							targetManager.unloadModuleR(module);
+							targetManager.unloadModuleR(mn);
 						}
 					}
 				}
@@ -408,29 +346,6 @@
 			}
 		});
 
-		this.deleteComponentButton = new Button(execButtonComposite, SWT.TOP);
-		this.deleteComponentButton.setText(LABEL_DELETE_COMPONENT_BUTTON);
-		gd = new GridData();
-		gd.widthHint = EXEC_BUTTON_WIDTH;
-		this.deleteComponentButton.setLayoutData(gd);
-		this.deleteComponentButton.setEnabled(false);
-		this.deleteComponentButton.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				if (targetManager != null) {
-					if (isSelectedActiveComponents) {
-						if (modulesTable.getSelectionIndex() != -1) {
-							String[] m = moduleList.get(modulesTable
-									.getSelectionIndex());
-							String comp = m[0];
-							targetManager.deleteComponentR(comp);
-						}
-					}
-				}
-				refreshModuleListData();
-			}
-		});
-
 		setSiteSelection();
 	}
 
@@ -453,7 +368,6 @@
 		this.activeComponentButton.setEnabled(false);
 		this.createButton.setEnabled(false);
 		this.forkButton.setEnabled(false);
-		this.restartButton.setEnabled(false);
 		this.shutdownButton.setEnabled(false);
 		this.loadButton.setEnabled(false);
 		this.unloadButton.setEnabled(false);
@@ -464,70 +378,61 @@
 			this.loadedModuleButton.setEnabled(true);
 			this.activeComponentButton.setEnabled(true);
 			this.createButton.setEnabled(true);
-			this.forkButton.setEnabled(true);
-			this.restartButton.setEnabled(true);
-			this.shutdownButton.setEnabled(true);
+			// マネージャの仕様が決まっていないので無効にする
+			this.forkButton.setEnabled(false);
+			this.shutdownButton.setEnabled(false);
 		}
 		refreshModuleListData();
 	}
 
 	private void refreshModuleListData() {
-		this.modulesTableViewer.setInput(Collections.EMPTY_LIST);
-		if (this.moduleList == null) {
-			this.moduleList = new ArrayList<String[]>();
+		modulesTableViewer.setInput(Collections.EMPTY_LIST);
+		if (moduleList == null) {
+			moduleList = new ArrayList<String>();
 		}
-		this.moduleList.clear();
-		this.urlText.setText("");
-		this.urlText.setEnabled(false);
-		this.loadButton.setEnabled(false);
-		this.unloadButton.setEnabled(false);
-		this.deleteComponentButton.setEnabled(false);
-		if (this.targetManager != null) {
-			if (this.isSelectedLoadableModules) {
-				for (String m : this.targetManager.getLoadableModuleFileNames()) {
-					this.moduleList.add(new String[] { m });
+		moduleList.clear();
+		urlText.setText(""); //$NON-NLS-1$
+		urlText.setEnabled(false);
+		loadButton.setEnabled(false);
+		unloadButton.setEnabled(false);
+		if (targetManager != null) {
+			if (isSelectedLoadableModules) {
+				for (Object o : targetManager.getLoadableModuleFileNames()) {
+					moduleList.add((String) o);
 				}
-				this.modulesTableViewer.setInput(this.moduleList);
-				this.urlText.setEnabled(true);
-			} else if (this.isSelectedLoadedModules) {
-				for (String m : this.targetManager.getLoadedModuleFileNames()) {
-					this.moduleList.add(new String[] { m });
+				modulesTableViewer.setInput(moduleList);
+				urlText.setEnabled(true);
+			} else if (isSelectedLoadedModules) {
+				for (Object o : targetManager.getLoadedModuleFileNames()) {
+					moduleList.add((String) o);
 				}
-				this.modulesTableViewer.setInput(this.moduleList);
-			} else if (this.isSelectedActiveComponents) {
-				for (RTC.ComponentProfile prof : this.targetManager
-						.getComponentProfiles()) {
-					String name = prof.instance_name;
-					String pg = SDOUtil.findValueAsString("process_group",
-							prof.properties);
-					pg = (pg == null) ? "" : pg;
-					this.moduleList.add(new String[] { name, pg });
+				modulesTableViewer.setInput(moduleList);
+			} else if (isSelectedActiveComponents) {
+				for (Object o : targetManager.getComponentInstanceNames()) {
+					moduleList.add((String) o);
 				}
-				this.modulesTableViewer.setInput(this.moduleList);
+				modulesTableViewer.setInput(moduleList);
 			}
 		}
 		updateEnableLoadButton();
 	}
 
 	private void updateEnableLoadButton() {
-		this.loadButton.setEnabled(false);
-		this.unloadButton.setEnabled(false);
-		this.deleteComponentButton.setEnabled(false);
-		if (this.modulesTable.getSelectionIndex() != -1) {
-			if (this.isSelectedLoadableModules) {
-				this.loadButton.setEnabled(true);
-			} else if (this.isSelectedLoadedModules) {
-				this.unloadButton.setEnabled(true);
-			} else if (this.isSelectedActiveComponents) {
-				this.deleteComponentButton.setEnabled(true);
+		loadButton.setEnabled(false);
+		unloadButton.setEnabled(false);
+		if (modulesTable.getSelectionIndex() != -1) {
+			if (isSelectedLoadableModules) {
+				loadButton.setEnabled(true);
+			} else if (isSelectedLoadedModules) {
+				unloadButton.setEnabled(true);
 			}
-		} else if (this.urlText.getText().length() > 0) {
+		} else if (urlText.getText().length() > 0) {
 			// URL指定の場合
-			this.loadButton.setEnabled(true);
+			loadButton.setEnabled(true);
 		}
 	}
 
-	@SuppressWarnings("rawtypes")
+	@SuppressWarnings("unchecked") //$NON-NLS-1$
 	@Override
 	public Object getAdapter(Class adapter) {
 		if (adapter.equals(IPropertySheetPage.class)) {
@@ -536,34 +441,9 @@
 		return super.getAdapter(adapter);
 	}
 
-	/** モジュール/コンポーネント一覧表示のLabelProvider */
-	public class ModuleLabelProvider extends LabelProvider implements
-			ITableLabelProvider, ITableColorProvider {
-		@Override
-		public Image getColumnImage(Object element, int columnIndex) {
-			return null;
-		}
-
-		@Override
-		public String getColumnText(Object element, int columnIndex) {
-			String[] entry = (String[]) element;
-			return (columnIndex < entry.length) ? entry[columnIndex] : "";
-		}
-
-		@Override
-		public Color getBackground(Object element, int columnIndex) {
-			return null;
-		}
-
-		@Override
-		public Color getForeground(Object element, int columnIndex) {
-			return null;
-		}
-	}
-
 	private ISelectionListener selectionListener = new ISelectionListener() {
-		@Override
 		public void selectionChanged(IWorkbenchPart part, ISelection selection) {
+			
 			targetManager = null;
 			if (selection instanceof IStructuredSelection) {
 				IStructuredSelection ss = (IStructuredSelection) selection;
@@ -584,12 +464,11 @@
 			return;
 		}
 
-		this.selectionListener.selectionChanged(null, getSite()
-				.getWorkbenchWindow().getSelectionService().getSelection());
-
+		selectionListener.selectionChanged(null, getSite().getWorkbenchWindow().getSelectionService().getSelection());
+		
 		// NameServiceViewの選択監視リスナを登録
 		getSite().getWorkbenchWindow().getSelectionService()
-				.addSelectionListener(this.selectionListener);
+				.addSelectionListener(selectionListener);
 
 		// SelectionProviderを登録(プロパティ・ビュー連携)
 		getSite().setSelectionProvider(new ISelectionProvider() {

Modified: trunk/rtmtools/jp.go.aist.rtm.systemeditor/test/jp/go/aist/rtm/systemeditor/ui/views/managercontrolview/mock/RTCManagerMock.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.systemeditor/test/jp/go/aist/rtm/systemeditor/ui/views/managercontrolview/mock/RTCManagerMock.java	2017-03-31 06:26:37 UTC (rev 717)
+++ trunk/rtmtools/jp.go.aist.rtm.systemeditor/test/jp/go/aist/rtm/systemeditor/ui/views/managercontrolview/mock/RTCManagerMock.java	2017-03-31 06:26:46 UTC (rev 718)
@@ -183,7 +183,7 @@
 	public void setConstraint(Rectangle rectangle) {
 	}
 
-	@SuppressWarnings("rawtypes")
+	@SuppressWarnings("unchecked")
 	public TreeIterator eAllContents() {
 		return null;
 	}
@@ -258,7 +258,7 @@
 	public void eSetDeliver(boolean deliver) {
 	}
 
-	@SuppressWarnings("rawtypes")
+	@SuppressWarnings("unchecked")
 	public java.lang.Object getAdapter(Class adapter) {
 		return null;
 	}
@@ -436,84 +436,4 @@
 	public EList<ModuleProfile> getLoadedModuleProfiles() {
 		return null;
 	}
-
-	@Override
-	public boolean isMaster() {
-		return false;
-	}
-
-	@Override
-	public void setMaster(boolean value) {
-	}
-
-	@Override
-	public EList<RTCManager> getMasterManagers() {
-		return null;
-	}
-
-	@Override
-	public EList<RTCManager> getSlaveManagers() {
-		return null;
-	}
-
-	@Override
-	public EList<jp.go.aist.rtm.toolscommon.model.component.NameValue> getConfiguratoins() {
-		return null;
-	}
-
-	@Override
-	public int restartR() {
-		return 0;
-	}
-
-	@Override
-	public boolean isMasterR() {
-		return false;
-	}
-
-	@Override
-	public EList<RTCManager> getMasterManagersR() {
-		return null;
-	}
-
-	@Override
-	public int addMasterManagerR(RTCManager mgr) {
-		return 0;
-	}
-
-	@Override
-	public int removeMasterManagerR(RTCManager mgr) {
-		return 0;
-	}
-
-	@Override
-	public EList<RTCManager> getSlaveManagersR() {
-		return null;
-	}
-
-	@Override
-	public int addSlaveManagerR(RTCManager mgr) {
-		return 0;
-	}
-
-	@Override
-	public int removeSlaveManagerR(RTCManager mgr) {
-		return 0;
-	}
-
-	@Override
-	public EList<jp.go.aist.rtm.toolscommon.model.component.NameValue> getConfigurationR() {
-		return null;
-	}
-
-	@Override
-	public int setConfigurationR(String name, String value) {
-		return 0;
-	}
-
-	@Override
-	public EList<String> getSlaveManagerNames() {
-		return null;
-	}
-
 }



openrtm-commit メーリングリストの案内