[openrtm-commit:02579] r732 - in trunk/rtmtools/jp.go.aist.rtm.systemeditor.RCP: . META-INF src/jp/go/aist/rtm/systemeditor/rcp
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2017年 4月 15日 (土) 15:46:20 JST
Author: ga
Date: 2017-04-15 15:46:20 +0900 (Sat, 15 Apr 2017)
New Revision: 732
Modified:
trunk/rtmtools/jp.go.aist.rtm.systemeditor.RCP/.classpath
trunk/rtmtools/jp.go.aist.rtm.systemeditor.RCP/META-INF/MANIFEST.MF
trunk/rtmtools/jp.go.aist.rtm.systemeditor.RCP/RTSystemEditor.product
trunk/rtmtools/jp.go.aist.rtm.systemeditor.RCP/src/jp/go/aist/rtm/systemeditor/rcp/ApplicationWorkbenchWindowAdvisor.java
Log:
Modified for Eclipse4.x RCP
Modified: trunk/rtmtools/jp.go.aist.rtm.systemeditor.RCP/.classpath
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.systemeditor.RCP/.classpath 2017-04-15 06:45:46 UTC (rev 731)
+++ trunk/rtmtools/jp.go.aist.rtm.systemeditor.RCP/.classpath 2017-04-15 06:46:20 UTC (rev 732)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
Modified: trunk/rtmtools/jp.go.aist.rtm.systemeditor.RCP/META-INF/MANIFEST.MF
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.systemeditor.RCP/META-INF/MANIFEST.MF 2017-04-15 06:45:46 UTC (rev 731)
+++ trunk/rtmtools/jp.go.aist.rtm.systemeditor.RCP/META-INF/MANIFEST.MF 2017-04-15 06:46:20 UTC (rev 732)
@@ -12,6 +12,5 @@
jp.go.aist.rtm.toolscommon;bundle-version="1.1.0",
jp.go.aist.rtm.toolscommon.profiles;bundle-version="1.1.0"
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: %providerName
Export-Package: jp.go.aist.rtm.systemeditor.rcp
Modified: trunk/rtmtools/jp.go.aist.rtm.systemeditor.RCP/RTSystemEditor.product
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.systemeditor.RCP/RTSystemEditor.product 2017-04-15 06:45:46 UTC (rev 731)
+++ trunk/rtmtools/jp.go.aist.rtm.systemeditor.RCP/RTSystemEditor.product 2017-04-15 06:46:20 UTC (rev 732)
@@ -36,6 +36,9 @@
<plugins>
<plugin id="com.ibm.icu"/>
<plugin id="com.ibm.icu.nl_ja" fragment="true"/>
+ <plugin id="javax.annotation"/>
+ <plugin id="javax.inject"/>
+ <plugin id="javax.xml"/>
<plugin id="jp.go.aist.rtm.nameserviceview"/>
<plugin id="jp.go.aist.rtm.nameserviceview.nl1" fragment="true"/>
<plugin id="jp.go.aist.rtm.repositoryView"/>
@@ -47,6 +50,9 @@
<plugin id="jp.go.aist.rtm.toolscommon.nl1" fragment="true"/>
<plugin id="jp.go.aist.rtm.toolscommon.profiles"/>
<plugin id="jp.go.aist.rtm.toolscommon.profiles.nl1" fragment="true"/>
+ <plugin id="org.apache.batik.css"/>
+ <plugin id="org.apache.batik.util"/>
+ <plugin id="org.apache.batik.util.gui"/>
<plugin id="org.eclipse.compare.core"/>
<plugin id="org.eclipse.compare.core.nl_ja" fragment="true"/>
<plugin id="org.eclipse.core.commands"/>
@@ -64,24 +70,64 @@
<plugin id="org.eclipse.core.filebuffers"/>
<plugin id="org.eclipse.core.filebuffers.nl_ja" fragment="true"/>
<plugin id="org.eclipse.core.filesystem"/>
+ <plugin id="org.eclipse.core.filesystem.java7" fragment="true"/>
<plugin id="org.eclipse.core.filesystem.nl_ja" fragment="true"/>
<plugin id="org.eclipse.core.filesystem.win32.x86" fragment="true"/>
+ <plugin id="org.eclipse.core.filesystem.win32.x86_64" fragment="true"/>
+ <plugin id="org.eclipse.core.filesystem.win32.x86_64.nl_ja" fragment="true"/>
<plugin id="org.eclipse.core.jobs"/>
<plugin id="org.eclipse.core.jobs.nl_ja" fragment="true"/>
<plugin id="org.eclipse.core.resources"/>
<plugin id="org.eclipse.core.resources.nl_ja" fragment="true"/>
<plugin id="org.eclipse.core.resources.win32.x86" fragment="true"/>
+ <plugin id="org.eclipse.core.resources.win32.x86_64" fragment="true"/>
<plugin id="org.eclipse.core.runtime"/>
<plugin id="org.eclipse.core.runtime.compatibility.registry" fragment="true"/>
<plugin id="org.eclipse.core.runtime.nl_ja" fragment="true"/>
<plugin id="org.eclipse.draw2d"/>
+ <plugin id="org.eclipse.e4.core.commands"/>
+ <plugin id="org.eclipse.e4.core.commands.nl_ja" fragment="true"/>
+ <plugin id="org.eclipse.e4.core.contexts"/>
+ <plugin id="org.eclipse.e4.core.di"/>
+ <plugin id="org.eclipse.e4.core.di.extensions"/>
+ <plugin id="org.eclipse.e4.core.services"/>
+ <plugin id="org.eclipse.e4.ui.bindings"/>
+ <plugin id="org.eclipse.e4.ui.bindings.nl_ja" fragment="true"/>
+ <plugin id="org.eclipse.e4.ui.css.core"/>
+ <plugin id="org.eclipse.e4.ui.css.core.nl_ja" fragment="true"/>
+ <plugin id="org.eclipse.e4.ui.css.swt"/>
+ <plugin id="org.eclipse.e4.ui.css.swt.nl_ja" fragment="true"/>
+ <plugin id="org.eclipse.e4.ui.css.swt.theme"/>
+ <plugin id="org.eclipse.e4.ui.css.swt.theme.nl_ja" fragment="true"/>
+ <plugin id="org.eclipse.e4.ui.di"/>
+ <plugin id="org.eclipse.e4.ui.di.nl_ja" fragment="true"/>
+ <plugin id="org.eclipse.e4.ui.model.workbench"/>
+ <plugin id="org.eclipse.e4.ui.model.workbench.nl_ja" fragment="true"/>
+ <plugin id="org.eclipse.e4.ui.services"/>
+ <plugin id="org.eclipse.e4.ui.services.nl_ja" fragment="true"/>
+ <plugin id="org.eclipse.e4.ui.widgets"/>
+ <plugin id="org.eclipse.e4.ui.widgets.nl_ja" fragment="true"/>
+ <plugin id="org.eclipse.e4.ui.workbench"/>
+ <plugin id="org.eclipse.e4.ui.workbench.addons.swt"/>
+ <plugin id="org.eclipse.e4.ui.workbench.addons.swt.nl_ja" fragment="true"/>
+ <plugin id="org.eclipse.e4.ui.workbench.nl_ja" fragment="true"/>
+ <plugin id="org.eclipse.e4.ui.workbench.renderers.swt"/>
+ <plugin id="org.eclipse.e4.ui.workbench.renderers.swt.nl_ja" fragment="true"/>
+ <plugin id="org.eclipse.e4.ui.workbench.swt"/>
+ <plugin id="org.eclipse.e4.ui.workbench.swt.nl_ja" fragment="true"/>
+ <plugin id="org.eclipse.e4.ui.workbench3"/>
+ <plugin id="org.eclipse.e4.ui.workbench3.nl_ja" fragment="true"/>
<plugin id="org.eclipse.emf.common"/>
<plugin id="org.eclipse.emf.ecore"/>
+ <plugin id="org.eclipse.emf.ecore.change"/>
<plugin id="org.eclipse.emf.ecore.xmi"/>
<plugin id="org.eclipse.equinox.app"/>
<plugin id="org.eclipse.equinox.app.nl_ja" fragment="true"/>
+ <plugin id="org.eclipse.equinox.bidi"/>
<plugin id="org.eclipse.equinox.common"/>
<plugin id="org.eclipse.equinox.common.nl_ja" fragment="true"/>
+ <plugin id="org.eclipse.equinox.ds"/>
+ <plugin id="org.eclipse.equinox.event"/>
<plugin id="org.eclipse.equinox.p2.core"/>
<plugin id="org.eclipse.equinox.p2.core.nl_ja" fragment="true"/>
<plugin id="org.eclipse.equinox.p2.engine"/>
@@ -99,6 +145,8 @@
<plugin id="org.eclipse.equinox.security"/>
<plugin id="org.eclipse.equinox.security.nl_ja" fragment="true"/>
<plugin id="org.eclipse.equinox.security.win32.x86" fragment="true"/>
+ <plugin id="org.eclipse.equinox.security.win32.x86_64" fragment="true"/>
+ <plugin id="org.eclipse.equinox.util"/>
<plugin id="org.eclipse.gef"/>
<plugin id="org.eclipse.help"/>
<plugin id="org.eclipse.help.nl_ja" fragment="true"/>
@@ -109,25 +157,41 @@
<plugin id="org.eclipse.jface.text"/>
<plugin id="org.eclipse.jface.text.nl_ja" fragment="true"/>
<plugin id="org.eclipse.osgi"/>
+ <plugin id="org.eclipse.osgi.compatibility.state" fragment="true"/>
<plugin id="org.eclipse.osgi.nl_ja" fragment="true"/>
+ <plugin id="org.eclipse.osgi.services"/>
+ <plugin id="org.eclipse.osgi.services.nl_ja" fragment="true"/>
+ <plugin id="org.eclipse.platform"/>
+ <plugin id="org.eclipse.platform.nl_ja" fragment="true"/>
<plugin id="org.eclipse.swt"/>
<plugin id="org.eclipse.swt.nl_ja" fragment="true"/>
<plugin id="org.eclipse.swt.win32.win32.x86" fragment="true"/>
+ <plugin id="org.eclipse.swt.win32.win32.x86_64" fragment="true"/>
+ <plugin id="org.eclipse.swt.win32.win32.x86_64.nl_ja" fragment="true"/>
<plugin id="org.eclipse.text"/>
<plugin id="org.eclipse.text.nl_ja" fragment="true"/>
<plugin id="org.eclipse.ui"/>
<plugin id="org.eclipse.ui.editors"/>
<plugin id="org.eclipse.ui.editors.nl_ja" fragment="true"/>
+ <plugin id="org.eclipse.ui.forms"/>
+ <plugin id="org.eclipse.ui.forms.nl_ja" fragment="true"/>
<plugin id="org.eclipse.ui.ide"/>
<plugin id="org.eclipse.ui.ide.nl_ja" fragment="true"/>
+ <plugin id="org.eclipse.ui.intro"/>
+ <plugin id="org.eclipse.ui.intro.nl_ja" fragment="true"/>
<plugin id="org.eclipse.ui.nl_ja" fragment="true"/>
<plugin id="org.eclipse.ui.views"/>
<plugin id="org.eclipse.ui.views.nl_ja" fragment="true"/>
<plugin id="org.eclipse.ui.win32" fragment="true"/>
+ <plugin id="org.eclipse.ui.win32.nl_ja" fragment="true"/>
<plugin id="org.eclipse.ui.workbench"/>
<plugin id="org.eclipse.ui.workbench.nl_ja" fragment="true"/>
<plugin id="org.eclipse.ui.workbench.texteditor"/>
<plugin id="org.eclipse.ui.workbench.texteditor.nl_ja" fragment="true"/>
+ <plugin id="org.w3c.css.sac"/>
+ <plugin id="org.w3c.dom.events"/>
+ <plugin id="org.w3c.dom.smil"/>
+ <plugin id="org.w3c.dom.svg"/>
</plugins>
Modified: trunk/rtmtools/jp.go.aist.rtm.systemeditor.RCP/src/jp/go/aist/rtm/systemeditor/rcp/ApplicationWorkbenchWindowAdvisor.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.systemeditor.RCP/src/jp/go/aist/rtm/systemeditor/rcp/ApplicationWorkbenchWindowAdvisor.java 2017-04-15 06:45:46 UTC (rev 731)
+++ trunk/rtmtools/jp.go.aist.rtm.systemeditor.RCP/src/jp/go/aist/rtm/systemeditor/rcp/ApplicationWorkbenchWindowAdvisor.java 2017-04-15 06:46:20 UTC (rev 732)
@@ -1,9 +1,8 @@
package jp.go.aist.rtm.systemeditor.rcp;
import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.preference.PreferenceManager;
-import org.eclipse.jface.window.ApplicationWindow;
import org.eclipse.swt.graphics.Point;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.PlatformUI;
@@ -39,22 +38,23 @@
@Override
public void postWindowCreate() {
- IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
- MenuManager mbManager=((ApplicationWindow)page.getWorkbenchWindow()).getMenuBarManager();
-
- for (IContributionItem item : mbManager.getItems()){
- if (item.getId().equals("file")){
- for (IContributionItem child : ((MenuManager)item).getItems() ) {
- String id = child.getId();
- if (id!=null &&
- (id.equals("converstLineDelimitersTo") || id.equals("save.ext")
- || id.equals("org.eclipse.ui.edit.text.openExternalFile") || id.equals("new.ext")) ){
- child.setVisible(false);
- child.dispose();
- }
- }
- }
- }
+ IMenuManager mbManager = getWindowConfigurer().getActionBarConfigurer()
+ .getMenuManager();
+ for (IContributionItem item : mbManager.getItems()) {
+ if (item.getId().equals("file")) {
+ for (IContributionItem child : ((IMenuManager) item).getItems()) {
+ String id = child.getId();
+ if (id != null
+ && (id.equals("converstLineDelimitersTo")
+ || id.equals("save.ext")
+ || id.equals("org.eclipse.ui.edit.text.openExternalFile") || id
+ .equals("new.ext"))) {
+ child.setVisible(false);
+ child.dispose();
+ }
+ }
+ }
+ }
}
@Override
openrtm-commit メーリングリストの案内