From 7409ec088a237fc17606f1b4282742a641bf6092 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Mon, 29 Jan 2018 15:18:15 +0100 Subject: [PATCH] Refactor SLC IDE --- .../META-INF/MANIFEST.MF | 10 +- .../org.argeo.slc.ide.product | 1138 +++++++++++------ .../org.argeo.slc.ide.branding/plugin.xml | 2 +- ide/plugins/org.argeo.slc.ide.ui/.classpath | 2 +- ide/plugins/org.argeo.slc.ide.ui/.gitignore | 1 + .../org.argeo.slc.ide.ui/META-INF/MANIFEST.MF | 67 +- ide/plugins/org.argeo.slc.ide.ui/bnd.bnd | 22 + ide/plugins/org.argeo.slc.ide.ui/pom.xml | 46 + .../argeo/slc/ide/ui/DeployedSlcSystem.java | 0 .../argeo/slc/ide/ui/EmbeddedSlcSystem.java | 0 .../org/argeo/slc/ide/ui/SlcIdeUiPlugin.java | 0 .../slc/ide/ui/SlcMainPreferencePage.java | 0 .../slc/ide/ui/SlcPerspectiveFactory.java | 6 +- .../org/argeo/slc/ide/ui/SlcSystem.java | 0 .../osgi/EclipseBootLaunchConfiguration.java | 0 .../osgi/EclipseBootLaunchShortcut.java | 0 .../osgi/EclipseBootLauncherTabGroup.java | 0 .../OsgiBootEquinoxLaunchConfiguration.java | 0 .../launch/osgi/OsgiBootLaunchShortcut.java | 0 .../launch/osgi/OsgiBootLauncherTabGroup.java | 0 .../ide/ui/launch/osgi/OsgiBootMainTab.java | 0 .../ide/ui/launch/osgi/OsgiLaunchHelper.java | 0 .../ui/launch/osgi/OsgiLauncherConstants.java | 0 .../preferences/SlcLaunchPreferencePage.java | 0 .../SlcScriptLaunchConfigurationTab.java | 31 +- .../SlcScriptLaunchConfigurationTabGroup.java | 0 .../script/SlcScriptLaunchDelegate.java | 0 .../script/SlcScriptLaunchShortcut.java | 0 .../SlcScriptLaunchShortcutWithDialog.java | 0 .../ide/ui/launch/script/SlcScriptUtils.java | 0 ide/plugins/pom.xml | 15 + ide/pom.xml | 15 + 32 files changed, 889 insertions(+), 466 deletions(-) create mode 100644 ide/plugins/org.argeo.slc.ide.ui/bnd.bnd create mode 100644 ide/plugins/org.argeo.slc.ide.ui/pom.xml rename ide/plugins/org.argeo.slc.ide.ui/src/{main/java => }/org/argeo/slc/ide/ui/DeployedSlcSystem.java (100%) rename ide/plugins/org.argeo.slc.ide.ui/src/{main/java => }/org/argeo/slc/ide/ui/EmbeddedSlcSystem.java (100%) rename ide/plugins/org.argeo.slc.ide.ui/src/{main/java => }/org/argeo/slc/ide/ui/SlcIdeUiPlugin.java (100%) rename ide/plugins/org.argeo.slc.ide.ui/src/{main/java => }/org/argeo/slc/ide/ui/SlcMainPreferencePage.java (100%) rename ide/plugins/org.argeo.slc.ide.ui/src/{main/java => }/org/argeo/slc/ide/ui/SlcPerspectiveFactory.java (76%) rename ide/plugins/org.argeo.slc.ide.ui/src/{main/java => }/org/argeo/slc/ide/ui/SlcSystem.java (100%) rename ide/plugins/org.argeo.slc.ide.ui/src/{main/java => }/org/argeo/slc/ide/ui/launch/osgi/EclipseBootLaunchConfiguration.java (100%) rename ide/plugins/org.argeo.slc.ide.ui/src/{main/java => }/org/argeo/slc/ide/ui/launch/osgi/EclipseBootLaunchShortcut.java (100%) rename ide/plugins/org.argeo.slc.ide.ui/src/{main/java => }/org/argeo/slc/ide/ui/launch/osgi/EclipseBootLauncherTabGroup.java (100%) rename ide/plugins/org.argeo.slc.ide.ui/src/{main/java => }/org/argeo/slc/ide/ui/launch/osgi/OsgiBootEquinoxLaunchConfiguration.java (100%) rename ide/plugins/org.argeo.slc.ide.ui/src/{main/java => }/org/argeo/slc/ide/ui/launch/osgi/OsgiBootLaunchShortcut.java (100%) rename ide/plugins/org.argeo.slc.ide.ui/src/{main/java => }/org/argeo/slc/ide/ui/launch/osgi/OsgiBootLauncherTabGroup.java (100%) rename ide/plugins/org.argeo.slc.ide.ui/src/{main/java => }/org/argeo/slc/ide/ui/launch/osgi/OsgiBootMainTab.java (100%) rename ide/plugins/org.argeo.slc.ide.ui/src/{main/java => }/org/argeo/slc/ide/ui/launch/osgi/OsgiLaunchHelper.java (100%) rename ide/plugins/org.argeo.slc.ide.ui/src/{main/java => }/org/argeo/slc/ide/ui/launch/osgi/OsgiLauncherConstants.java (100%) rename ide/plugins/org.argeo.slc.ide.ui/src/{main/java => }/org/argeo/slc/ide/ui/launch/preferences/SlcLaunchPreferencePage.java (100%) rename ide/plugins/org.argeo.slc.ide.ui/src/{main/java => }/org/argeo/slc/ide/ui/launch/script/SlcScriptLaunchConfigurationTab.java (86%) rename ide/plugins/org.argeo.slc.ide.ui/src/{main/java => }/org/argeo/slc/ide/ui/launch/script/SlcScriptLaunchConfigurationTabGroup.java (100%) rename ide/plugins/org.argeo.slc.ide.ui/src/{main/java => }/org/argeo/slc/ide/ui/launch/script/SlcScriptLaunchDelegate.java (100%) rename ide/plugins/org.argeo.slc.ide.ui/src/{main/java => }/org/argeo/slc/ide/ui/launch/script/SlcScriptLaunchShortcut.java (100%) rename ide/plugins/org.argeo.slc.ide.ui/src/{main/java => }/org/argeo/slc/ide/ui/launch/script/SlcScriptLaunchShortcutWithDialog.java (100%) rename ide/plugins/org.argeo.slc.ide.ui/src/{main/java => }/org/argeo/slc/ide/ui/launch/script/SlcScriptUtils.java (100%) create mode 100644 ide/plugins/pom.xml create mode 100644 ide/pom.xml diff --git a/ide/plugins/org.argeo.slc.ide.branding/META-INF/MANIFEST.MF b/ide/plugins/org.argeo.slc.ide.branding/META-INF/MANIFEST.MF index f1381c2c4..2c7c4a9fd 100644 --- a/ide/plugins/org.argeo.slc.ide.branding/META-INF/MANIFEST.MF +++ b/ide/plugins/org.argeo.slc.ide.branding/META-INF/MANIFEST.MF @@ -4,9 +4,9 @@ Bundle-Name: Argeo IDE Bundle-SymbolicName: org.argeo.slc.ide.branding;singleton:=true Bundle-Version: 1.1.1.D20121107_1340 Bundle-Vendor: Argeo.org -Require-Bundle: org.eclipse.ui;bundle-version="3.5.1", - org.eclipse.osgi;bundle-version="3.5.1", - org.eclipse.core.runtime;bundle-version="3.5.0", - org.eclipse.jdt.ui;bundle-version="3.5.1", - org.eclipse.ui.console;bundle-version="3.4.0" +Require-Bundle: org.eclipse.ui, + org.eclipse.osgi, + org.eclipse.core.runtime, + org.eclipse.jdt.ui, + org.eclipse.ui.console Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/ide/plugins/org.argeo.slc.ide.branding/org.argeo.slc.ide.product b/ide/plugins/org.argeo.slc.ide.branding/org.argeo.slc.ide.product index 0d93d1e40..6561c4101 100644 --- a/ide/plugins/org.argeo.slc.ide.branding/org.argeo.slc.ide.product +++ b/ide/plugins/org.argeo.slc.ide.branding/org.argeo.slc.ide.product @@ -1,7 +1,7 @@ - + @@ -14,6 +14,10 @@ + -console + + -Dargeo.osgi.start.2.node=org.eclipse.equinox.http.servlet,org.eclipse.equinox.http.jetty,org.eclipse.equinox.metatype,org.eclipse.equinox.cm,org.eclipse.rap.rwt.osgi -Dargeo.osgi.start.3.node=org.argeo.cms -Dargeo.osgi.start.4.apps=org.eclipse.gemini.blueprint.extender -Djava.security.manager= -Djava.security.policy=all.policy + -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts @@ -27,7 +31,6 @@ startupForegroundColor="0066D0" /> - @@ -131,313 +134,549 @@ This Agreement is governed by the laws of the State of New York and the intellec - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + - + + + + - - - + + + + - - + + + - - - - - - - + + + - - + + - - + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + - - - - - - - - - + + + - - - + + - - + - - - + - + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - + + + + + + + + - - - - - - - - - - + - + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + - + + + + - + + + + - - - + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - + + - + + - + + + + + + + + + - + + + + + - - + + + + + + + + + + - + + + - - + - - - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - + + + + + @@ -449,231 +688,235 @@ This Agreement is governed by the laws of the State of New York and the intellec + + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - + + + + + + - + - + + + + + + + + + + + + + + + + + - + + + + + - + + - + + - - - - - - - - - - + + + + @@ -682,6 +925,7 @@ This Agreement is governed by the laws of the State of New York and the intellec + @@ -700,15 +944,48 @@ This Agreement is governed by the laws of the State of New York and the intellec + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + @@ -726,74 +1003,86 @@ This Agreement is governed by the laws of the State of New York and the intellec - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -830,5 +1119,20 @@ This Agreement is governed by the laws of the State of New York and the intellec + + + + + + + + + + + + + + + diff --git a/ide/plugins/org.argeo.slc.ide.branding/plugin.xml b/ide/plugins/org.argeo.slc.ide.branding/plugin.xml index 19b35d1d0..850762749 100644 --- a/ide/plugins/org.argeo.slc.ide.branding/plugin.xml +++ b/ide/plugins/org.argeo.slc.ide.branding/plugin.xml @@ -6,7 +6,7 @@ id="product" point="org.eclipse.core.runtime.products"> - + diff --git a/ide/plugins/org.argeo.slc.ide.ui/.gitignore b/ide/plugins/org.argeo.slc.ide.ui/.gitignore index ae3c17260..09e3bc9b2 100644 --- a/ide/plugins/org.argeo.slc.ide.ui/.gitignore +++ b/ide/plugins/org.argeo.slc.ide.ui/.gitignore @@ -1 +1,2 @@ /bin/ +/target/ diff --git a/ide/plugins/org.argeo.slc.ide.ui/META-INF/MANIFEST.MF b/ide/plugins/org.argeo.slc.ide.ui/META-INF/MANIFEST.MF index aa3700c99..ab196498c 100644 --- a/ide/plugins/org.argeo.slc.ide.ui/META-INF/MANIFEST.MF +++ b/ide/plugins/org.argeo.slc.ide.ui/META-INF/MANIFEST.MF @@ -1,21 +1,46 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: SLC IDE -Bundle-SymbolicName: org.argeo.slc.ide.ui;singleton:=true -Bundle-Version: 1.1.1.qualifier -Bundle-Activator: org.argeo.slc.ide.ui.SlcIdeUiPlugin -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.debug.core, - org.eclipse.jdt.launching, - org.eclipse.debug.ui, - org.eclipse.jdt.core, - org.eclipse.ui.console, - org.eclipse.jdt.debug.ui, - org.eclipse.ui.ide, - org.eclipse.core.variables, - org.eclipse.pde.ui;bundle-version="3.4.0", - org.eclipse.jdt.ui;bundle-version="3.4.2" -Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Bundle-Vendor: Argeo GmbH -Bundle-ActivationPolicy: lazy +Manifest-Version: 1.0 +Bundle-ActivationPolicy: lazy +Bundle-Activator: org.argeo.slc.ide.ui.SlcIdeUiPlugin +Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt +Bundle-ManifestVersion: 2 +Bundle-Name: IDE UI +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-SymbolicName: org.argeo.slc.ide.ui;singleton=true +Bundle-Version: 2.1.11.SNAPSHOT-r201801241311 +Export-Package: org.argeo.slc.ide.ui;uses:="org.eclipse.debug.core,org.e + clipse.jdt.core,org.eclipse.jdt.launching,org.eclipse.jface.preference, + org.eclipse.swt.graphics,org.eclipse.ui,org.eclipse.ui.plugin,org.osgi. + framework";version="2.1.11.SNAPSHOT-r201801241311",org.argeo.slc.ide.ui + .launch.preferences;uses:="org.eclipse.jface.preference,org.eclipse.ui" + ;version="2.1.11.SNAPSHOT-r201801241311",org.argeo.slc.ide.ui.launch.os + gi;uses:="org.eclipse.core.resources,org.eclipse.debug.core,org.eclipse + .debug.ui,org.eclipse.jdt.launching,org.eclipse.jface.viewers,org.eclip + se.pde.launching,org.eclipse.pde.ui.launcher,org.eclipse.swt.graphics,o + rg.eclipse.swt.widgets";version="2.1.11.SNAPSHOT-r201801241311",org.arg + eo.slc.ide.ui.launch.script;uses:="org.argeo.slc.ide.ui,org.eclipse.cor + e.resources,org.eclipse.debug.core,org.eclipse.debug.ui,org.eclipse.jdt + .core,org.eclipse.jdt.launching,org.eclipse.jface.viewers,org.eclipse.s + wt.widgets,org.eclipse.ui";version="2.1.11.SNAPSHOT-r201801241311" +Import-Package: org.eclipse.swt.widgets,org.osgi.framework;version="0.0. + 0",org.argeo.slc.ide.ui,org.eclipse.core.resources,org.eclipse.core.var + iables,org.eclipse.debug.core,org.eclipse.debug.core.model,org.eclipse. + debug.ui,org.eclipse.jdt.core,org.eclipse.jdt.launching,org.eclipse.jfa + ce.dialogs,org.eclipse.jface.preference,org.eclipse.jface.resource,org. + eclipse.jface.viewers,org.eclipse.osgi.service.resolver;version="[1.6,2 + )",org.eclipse.pde.core.plugin,org.eclipse.pde.launching,org.eclipse.pd + e.ui.launcher,org.eclipse.swt.events,org.eclipse.swt.graphics,org.eclip + se.swt.layout,org.eclipse.ui;ui.workbench=split,org.eclipse.ui.plugin,o + rg.argeo.cms.auth;version="[2.1,3)",org.argeo.eclipse.spring;version="[ + 2.1,3)",org.argeo.eclipse.ui.utils;version="[2.1,3)",org.eclipse.core.r + untime.jobs,org.eclipse.jface.window,org.eclipse.swt,org.eclipse.ui.ser + vices,org.springframework.core;version="[3.2,4)",org.springframework.be + ans.factory;version="[3.2,4)",org.springframework.core.io.support;versi + on="[3.2,4)",org.eclipse.pde.core +Include-Resource: icons/eclipse-launch.gif=icons/eclipse-launch.gif,icon + s/argeo-icon-100104-256.png=icons/argeo-icon-100104-256.png,icons/slc-l + aunch.gif=icons/slc-launch.gif,targets/managedTarget.target=targets/man + agedTarget.target,plugin.xml=plugin.xml +Private-Package: icons,targets +Require-Bundle: org.eclipse.core.runtime,org.eclipse.core.commands +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.8))" +SLC-Category: org.argeo.slc diff --git a/ide/plugins/org.argeo.slc.ide.ui/bnd.bnd b/ide/plugins/org.argeo.slc.ide.ui/bnd.bnd new file mode 100644 index 000000000..825921fad --- /dev/null +++ b/ide/plugins/org.argeo.slc.ide.ui/bnd.bnd @@ -0,0 +1,22 @@ +Bundle-SymbolicName: org.argeo.slc.ide.ui;singleton=true +Bundle-Activator: org.argeo.slc.ide.ui.SlcIdeUiPlugin +Bundle-ActivationPolicy: lazy + +Require-Bundle: org.eclipse.core.runtime,\ +org.eclipse.core.commands + +Import-Package: org.argeo.cms.auth,\ +org.argeo.eclipse.spring,\ +org.argeo.eclipse.ui.utils,\ +org.eclipse.core.runtime.jobs,\ +org.eclipse.jface.window,\ +org.eclipse.swt,\ +org.eclipse.swt.widgets,\ +org.eclipse.ui.services,\ +org.osgi.*;version=0.0.0,\ +org.springframework.core,\ +org.springframework.beans.factory,\ +org.springframework.core.io.support,\ +!org.eclipse.core.runtime,\ +org.eclipse.pde.core,\ +* diff --git a/ide/plugins/org.argeo.slc.ide.ui/pom.xml b/ide/plugins/org.argeo.slc.ide.ui/pom.xml new file mode 100644 index 000000000..ef35acb0c --- /dev/null +++ b/ide/plugins/org.argeo.slc.ide.ui/pom.xml @@ -0,0 +1,46 @@ + + 4.0.0 + + org.argeo.slc + ide-plugins + 2.1.11-SNAPSHOT + .. + + org.argeo.slc.ide.ui + IDE UI + jar + + + + org.argeo.slc + org.argeo.slc.core + 2.1.11-SNAPSHOT + + + + + org.argeo.commons + org.argeo.eclipse.ui + ${version.argeo-commons} + + + org.argeo.commons + org.argeo.cms.ui.workbench + ${version.argeo-commons} + + + org.argeo.commons.rcp + org.argeo.eclipse.ui.rcp + ${version.argeo-rcp} + + + + + org.argeo.commons.rcp + org.argeo.dep.cms.ide + ${version.argeo-rcp} + provided + + + diff --git a/ide/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/DeployedSlcSystem.java b/ide/plugins/org.argeo.slc.ide.ui/src/org/argeo/slc/ide/ui/DeployedSlcSystem.java similarity index 100% rename from ide/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/DeployedSlcSystem.java rename to ide/plugins/org.argeo.slc.ide.ui/src/org/argeo/slc/ide/ui/DeployedSlcSystem.java diff --git a/ide/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/EmbeddedSlcSystem.java b/ide/plugins/org.argeo.slc.ide.ui/src/org/argeo/slc/ide/ui/EmbeddedSlcSystem.java similarity index 100% rename from ide/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/EmbeddedSlcSystem.java rename to ide/plugins/org.argeo.slc.ide.ui/src/org/argeo/slc/ide/ui/EmbeddedSlcSystem.java diff --git a/ide/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/SlcIdeUiPlugin.java b/ide/plugins/org.argeo.slc.ide.ui/src/org/argeo/slc/ide/ui/SlcIdeUiPlugin.java similarity index 100% rename from ide/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/SlcIdeUiPlugin.java rename to ide/plugins/org.argeo.slc.ide.ui/src/org/argeo/slc/ide/ui/SlcIdeUiPlugin.java diff --git a/ide/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/SlcMainPreferencePage.java b/ide/plugins/org.argeo.slc.ide.ui/src/org/argeo/slc/ide/ui/SlcMainPreferencePage.java similarity index 100% rename from ide/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/SlcMainPreferencePage.java rename to ide/plugins/org.argeo.slc.ide.ui/src/org/argeo/slc/ide/ui/SlcMainPreferencePage.java diff --git a/ide/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/SlcPerspectiveFactory.java b/ide/plugins/org.argeo.slc.ide.ui/src/org/argeo/slc/ide/ui/SlcPerspectiveFactory.java similarity index 76% rename from ide/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/SlcPerspectiveFactory.java rename to ide/plugins/org.argeo.slc.ide.ui/src/org/argeo/slc/ide/ui/SlcPerspectiveFactory.java index 7c0084e21..297a9190c 100644 --- a/ide/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/SlcPerspectiveFactory.java +++ b/ide/plugins/org.argeo.slc.ide.ui/src/org/argeo/slc/ide/ui/SlcPerspectiveFactory.java @@ -1,10 +1,8 @@ package org.argeo.slc.ide.ui; -import org.eclipse.jdt.ui.JavaUI; import org.eclipse.ui.IFolderLayout; import org.eclipse.ui.IPageLayout; import org.eclipse.ui.IPerspectiveFactory; -import org.eclipse.ui.console.IConsoleConstants; public class SlcPerspectiveFactory implements IPerspectiveFactory { @@ -14,11 +12,11 @@ public class SlcPerspectiveFactory implements IPerspectiveFactory { IFolderLayout topLeft = layout.createFolder("topLeft", IPageLayout.LEFT, 0.25f, editorArea); - topLeft.addView(JavaUI.ID_PACKAGES); +// topLeft.addView(JavaUI.ID_PACKAGES); IFolderLayout bottom = layout.createFolder("bottom", IPageLayout.BOTTOM, 0.66f, editorArea); - bottom.addView(IConsoleConstants.ID_CONSOLE_VIEW); +// bottom.addView(IConsoleConstants.ID_CONSOLE_VIEW); bottom.addView(IPageLayout.ID_TASK_LIST); layout.addActionSet("org.eclipse.debug.ui.launchActionSet"); diff --git a/ide/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/SlcSystem.java b/ide/plugins/org.argeo.slc.ide.ui/src/org/argeo/slc/ide/ui/SlcSystem.java similarity index 100% rename from ide/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/SlcSystem.java rename to ide/plugins/org.argeo.slc.ide.ui/src/org/argeo/slc/ide/ui/SlcSystem.java diff --git a/ide/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/launch/osgi/EclipseBootLaunchConfiguration.java b/ide/plugins/org.argeo.slc.ide.ui/src/org/argeo/slc/ide/ui/launch/osgi/EclipseBootLaunchConfiguration.java similarity index 100% rename from ide/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/launch/osgi/EclipseBootLaunchConfiguration.java rename to ide/plugins/org.argeo.slc.ide.ui/src/org/argeo/slc/ide/ui/launch/osgi/EclipseBootLaunchConfiguration.java diff --git a/ide/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/launch/osgi/EclipseBootLaunchShortcut.java b/ide/plugins/org.argeo.slc.ide.ui/src/org/argeo/slc/ide/ui/launch/osgi/EclipseBootLaunchShortcut.java similarity index 100% rename from ide/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/launch/osgi/EclipseBootLaunchShortcut.java rename to ide/plugins/org.argeo.slc.ide.ui/src/org/argeo/slc/ide/ui/launch/osgi/EclipseBootLaunchShortcut.java diff --git a/ide/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/launch/osgi/EclipseBootLauncherTabGroup.java b/ide/plugins/org.argeo.slc.ide.ui/src/org/argeo/slc/ide/ui/launch/osgi/EclipseBootLauncherTabGroup.java similarity index 100% rename from ide/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/launch/osgi/EclipseBootLauncherTabGroup.java rename to ide/plugins/org.argeo.slc.ide.ui/src/org/argeo/slc/ide/ui/launch/osgi/EclipseBootLauncherTabGroup.java diff --git a/ide/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/launch/osgi/OsgiBootEquinoxLaunchConfiguration.java b/ide/plugins/org.argeo.slc.ide.ui/src/org/argeo/slc/ide/ui/launch/osgi/OsgiBootEquinoxLaunchConfiguration.java similarity index 100% rename from ide/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/launch/osgi/OsgiBootEquinoxLaunchConfiguration.java rename to ide/plugins/org.argeo.slc.ide.ui/src/org/argeo/slc/ide/ui/launch/osgi/OsgiBootEquinoxLaunchConfiguration.java diff --git a/ide/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/launch/osgi/OsgiBootLaunchShortcut.java b/ide/plugins/org.argeo.slc.ide.ui/src/org/argeo/slc/ide/ui/launch/osgi/OsgiBootLaunchShortcut.java similarity index 100% rename from ide/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/launch/osgi/OsgiBootLaunchShortcut.java rename to ide/plugins/org.argeo.slc.ide.ui/src/org/argeo/slc/ide/ui/launch/osgi/OsgiBootLaunchShortcut.java diff --git a/ide/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/launch/osgi/OsgiBootLauncherTabGroup.java b/ide/plugins/org.argeo.slc.ide.ui/src/org/argeo/slc/ide/ui/launch/osgi/OsgiBootLauncherTabGroup.java similarity index 100% rename from ide/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/launch/osgi/OsgiBootLauncherTabGroup.java rename to ide/plugins/org.argeo.slc.ide.ui/src/org/argeo/slc/ide/ui/launch/osgi/OsgiBootLauncherTabGroup.java diff --git a/ide/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/launch/osgi/OsgiBootMainTab.java b/ide/plugins/org.argeo.slc.ide.ui/src/org/argeo/slc/ide/ui/launch/osgi/OsgiBootMainTab.java similarity index 100% rename from ide/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/launch/osgi/OsgiBootMainTab.java rename to ide/plugins/org.argeo.slc.ide.ui/src/org/argeo/slc/ide/ui/launch/osgi/OsgiBootMainTab.java diff --git a/ide/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/launch/osgi/OsgiLaunchHelper.java b/ide/plugins/org.argeo.slc.ide.ui/src/org/argeo/slc/ide/ui/launch/osgi/OsgiLaunchHelper.java similarity index 100% rename from ide/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/launch/osgi/OsgiLaunchHelper.java rename to ide/plugins/org.argeo.slc.ide.ui/src/org/argeo/slc/ide/ui/launch/osgi/OsgiLaunchHelper.java diff --git a/ide/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/launch/osgi/OsgiLauncherConstants.java b/ide/plugins/org.argeo.slc.ide.ui/src/org/argeo/slc/ide/ui/launch/osgi/OsgiLauncherConstants.java similarity index 100% rename from ide/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/launch/osgi/OsgiLauncherConstants.java rename to ide/plugins/org.argeo.slc.ide.ui/src/org/argeo/slc/ide/ui/launch/osgi/OsgiLauncherConstants.java diff --git a/ide/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/launch/preferences/SlcLaunchPreferencePage.java b/ide/plugins/org.argeo.slc.ide.ui/src/org/argeo/slc/ide/ui/launch/preferences/SlcLaunchPreferencePage.java similarity index 100% rename from ide/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/launch/preferences/SlcLaunchPreferencePage.java rename to ide/plugins/org.argeo.slc.ide.ui/src/org/argeo/slc/ide/ui/launch/preferences/SlcLaunchPreferencePage.java diff --git a/ide/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/launch/script/SlcScriptLaunchConfigurationTab.java b/ide/plugins/org.argeo.slc.ide.ui/src/org/argeo/slc/ide/ui/launch/script/SlcScriptLaunchConfigurationTab.java similarity index 86% rename from ide/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/launch/script/SlcScriptLaunchConfigurationTab.java rename to ide/plugins/org.argeo.slc.ide.ui/src/org/argeo/slc/ide/ui/launch/script/SlcScriptLaunchConfigurationTab.java index f73a8ca5c..3af85d653 100644 --- a/ide/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/launch/script/SlcScriptLaunchConfigurationTab.java +++ b/ide/plugins/org.argeo.slc.ide.ui/src/org/argeo/slc/ide/ui/launch/script/SlcScriptLaunchConfigurationTab.java @@ -1,12 +1,9 @@ package org.argeo.slc.ide.ui.launch.script; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; import org.eclipse.debug.ui.AbstractLaunchConfigurationTab; -import org.eclipse.jface.window.Window; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; @@ -18,7 +15,6 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; -import org.eclipse.ui.dialogs.ResourceSelectionDialog; public class SlcScriptLaunchConfigurationTab extends AbstractLaunchConfigurationTab { @@ -154,19 +150,20 @@ public class SlcScriptLaunchConfigurationTab extends } protected void handleWorkspaceLocationButtonSelected() { - ResourceSelectionDialog dialog; - dialog = new ResourceSelectionDialog(getShell(), ResourcesPlugin - .getWorkspace().getRoot(), "Select a file"); - if (dialog.open() == Window.OK) { - Object[] results = dialog.getResult(); - if (results == null || results.length < 1) { - return; - } - IResource resource = (IResource) results[0]; - scriptTF.setText(SlcScriptUtils - .convertToWorkspaceLocation(resource)); - updateLaunchConfigurationDialog(); - } + // FIXME do not use resource framework +// ResourceSelectionDialog dialog; +// dialog = new ResourceSelectionDialog(getShell(), ResourcesPlugin +// .getWorkspace().getRoot(), "Select a file"); +// if (dialog.open() == Window.OK) { +// Object[] results = dialog.getResult(); +// if (results == null || results.length < 1) { +// return; +// } +// IResource resource = (IResource) results[0]; +// scriptTF.setText(SlcScriptUtils +// .convertToWorkspaceLocation(resource)); +// updateLaunchConfigurationDialog(); +// } } // LISTENERS diff --git a/ide/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/launch/script/SlcScriptLaunchConfigurationTabGroup.java b/ide/plugins/org.argeo.slc.ide.ui/src/org/argeo/slc/ide/ui/launch/script/SlcScriptLaunchConfigurationTabGroup.java similarity index 100% rename from ide/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/launch/script/SlcScriptLaunchConfigurationTabGroup.java rename to ide/plugins/org.argeo.slc.ide.ui/src/org/argeo/slc/ide/ui/launch/script/SlcScriptLaunchConfigurationTabGroup.java diff --git a/ide/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/launch/script/SlcScriptLaunchDelegate.java b/ide/plugins/org.argeo.slc.ide.ui/src/org/argeo/slc/ide/ui/launch/script/SlcScriptLaunchDelegate.java similarity index 100% rename from ide/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/launch/script/SlcScriptLaunchDelegate.java rename to ide/plugins/org.argeo.slc.ide.ui/src/org/argeo/slc/ide/ui/launch/script/SlcScriptLaunchDelegate.java diff --git a/ide/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/launch/script/SlcScriptLaunchShortcut.java b/ide/plugins/org.argeo.slc.ide.ui/src/org/argeo/slc/ide/ui/launch/script/SlcScriptLaunchShortcut.java similarity index 100% rename from ide/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/launch/script/SlcScriptLaunchShortcut.java rename to ide/plugins/org.argeo.slc.ide.ui/src/org/argeo/slc/ide/ui/launch/script/SlcScriptLaunchShortcut.java diff --git a/ide/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/launch/script/SlcScriptLaunchShortcutWithDialog.java b/ide/plugins/org.argeo.slc.ide.ui/src/org/argeo/slc/ide/ui/launch/script/SlcScriptLaunchShortcutWithDialog.java similarity index 100% rename from ide/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/launch/script/SlcScriptLaunchShortcutWithDialog.java rename to ide/plugins/org.argeo.slc.ide.ui/src/org/argeo/slc/ide/ui/launch/script/SlcScriptLaunchShortcutWithDialog.java diff --git a/ide/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/launch/script/SlcScriptUtils.java b/ide/plugins/org.argeo.slc.ide.ui/src/org/argeo/slc/ide/ui/launch/script/SlcScriptUtils.java similarity index 100% rename from ide/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/launch/script/SlcScriptUtils.java rename to ide/plugins/org.argeo.slc.ide.ui/src/org/argeo/slc/ide/ui/launch/script/SlcScriptUtils.java diff --git a/ide/plugins/pom.xml b/ide/plugins/pom.xml new file mode 100644 index 000000000..85efe8695 --- /dev/null +++ b/ide/plugins/pom.xml @@ -0,0 +1,15 @@ + + 4.0.0 + + org.argeo.slc + ide + 2.1.11-SNAPSHOT + .. + + ide-plugins + pom + IDE Plugins + + org.argeo.slc.ide.ui + + \ No newline at end of file diff --git a/ide/pom.xml b/ide/pom.xml new file mode 100644 index 000000000..64dd819ed --- /dev/null +++ b/ide/pom.xml @@ -0,0 +1,15 @@ + + 4.0.0 + + org.argeo.slc + argeo-slc + 2.1.11-SNAPSHOT + .. + + ide + pom + IDE + + plugins + + \ No newline at end of file -- 2.39.2